* Re: texinfo
1998-04-10 0:39 texinfo Jeffrey A Law
1998-04-10 12:23 ` texinfo Ian Lance Taylor
@ 1998-04-10 20:10 ` Alexandre Oliva
1998-04-12 20:01 ` texinfo Jeffrey A Law
1 sibling, 1 reply; 5+ messages in thread
From: Alexandre Oliva @ 1998-04-10 20:10 UTC (permalink / raw)
To: law; +Cc: egcs, wilson
[-- Attachment #1: Type: text/plain, Size: 916 bytes --]
Jeffrey A Law writes:
> I've installed a patch from Jim which disables builds in the
> problem directories since we really don't need to build them.
> Is anyone familiar enough with automake to help me install a
> default rule to disable installation in the texinfo tree?
The attached patch should take care of that, although I think it might
be easier to remove install-texinfo from INSTALL_MODULES.
The first patch will fix a problem I found on some of my local
systems: zlib is installed in non-standard directories. The
previously-installed gcc can find libz.a, but it can't find zlib.h, so
install-info.c failed to compile. IMO, this should be applied in the
main texinfo sources too.
The rest of the patch modify texinfo so that nothing is installed.
--
Alexandre Oliva
mailto:oliva@dcc.unicamp.br mailto:aoliva@acm.org
http://www.dcc.unicamp.br/~oliva
Universidade Estadual de Campinas, SP, Brasil
[-- Attachment #2: texinfo-noinst.diff --]
[-- Type: text/x-diff, Size: 4120 bytes --]
texinfo/ChangeLog:
DATE Alexandre Oliva <oliva@dcc.unicamp.br>
* configure.in: only set HAVE_LIBZ if zlib.h exists
* doc/Makefile.am: don't install anything
* info/Makefile.am: ditto
* makeinfo/Makefile.am: ditto
* util/Makefile.am: ditto
texinfo/po/ChangeLog:
DATE Alexandre Oliva <oliva@dcc.unicamp.br>
* Makefile.in.in: don't install anything
Index: texinfo/configure.in
===================================================================
RCS file: /egcs/carton/cvsfiles/egcs/texinfo/configure.in,v
retrieving revision 1.7
diff -u -r1.7 configure.in
--- configure.in 1998/03/26 10:30:41 1.7
+++ configure.in 1998/04/10 20:54:06
@@ -27,7 +27,7 @@
AM_EXEEXT
dnl Checks for libraries.
-AC_CHECK_LIB(z, gzdopen)
+AC_CHECK_HEADERS(zlib.h, [AC_CHECK_LIB(z, gzdopen)])
# Needed on sysV68 for sigblock, sigsetmask. But check for it in libc first.
AC_CHECK_FUNC(sigblock, , AC_CHECK_LIB(bsd, sigblock))
Index: texinfo/doc/Makefile.am
===================================================================
RCS file: /egcs/carton/cvsfiles/egcs/texinfo/doc/Makefile.am,v
retrieving revision 1.3
diff -u -r1.3 Makefile.am
--- Makefile.am 1998/03/24 19:40:35 1.3
+++ Makefile.am 1998/04/10 20:54:06
@@ -2,7 +2,7 @@
## $Id: Makefile.am,v 1.3 1998/03/24 19:40:35 law Exp $
## Run automake in .. to produce Makefile.in from this.
-info_TEXINFOS = info-stnd.texi info.texi texinfo.txi
+noinst_TEXINFOS = info-stnd.texi info.texi texinfo.txi
# Use the programs built in our distribution.
MAKEINFO = ../makeinfo/makeinfo
Index: texinfo/info/Makefile.am
===================================================================
RCS file: /egcs/carton/cvsfiles/egcs/texinfo/info/Makefile.am,v
retrieving revision 1.3
diff -u -r1.3 Makefile.am
--- Makefile.am 1998/03/24 19:40:42 1.3
+++ Makefile.am 1998/04/10 20:54:06
@@ -2,12 +2,12 @@
## $Id: Makefile.am,v 1.3 1998/03/24 19:40:42 law Exp $
## Run automake in .. to produce Makefile.in from this.
-noinst_PROGRAMS = makedoc
+noinst_PROGRAMS = makedoc ginfo
# Use `ginfo' for building to avoid confusion with the standard `info'
# target. The install rule removes the `g' before applying any
# user-specified name transformations.
-bin_PROGRAMS = ginfo
+#bin_PROGRAMS = ginfo
transform = s/ginfo/info/; @program_transform_name@
localedir = $(datadir)/locale
Index: texinfo/makeinfo/Makefile.am
===================================================================
RCS file: /egcs/carton/cvsfiles/egcs/texinfo/makeinfo/Makefile.am,v
retrieving revision 1.3
diff -u -r1.3 Makefile.am
--- Makefile.am 1998/03/24 19:41:22 1.3
+++ Makefile.am 1998/04/10 20:54:07
@@ -2,7 +2,7 @@
## $Id: Makefile.am,v 1.3 1998/03/24 19:41:22 law Exp $
## Run automake in .. to produce Makefile.in from this.
-bin_PROGRAMS = makeinfo
+noinst_PROGRAMS = makeinfo
localedir = $(datadir)/locale
INCLUDES = -I$(top_srcdir)/lib -I../intl -DLOCALEDIR=\"$(localedir)\"
Index: texinfo/po/Makefile.in.in
===================================================================
RCS file: /egcs/carton/cvsfiles/egcs/texinfo/po/Makefile.in.in,v
retrieving revision 1.3
diff -u -r1.3 Makefile.in.in
--- Makefile.in.in 1998/03/24 19:41:29 1.3
+++ Makefile.in.in 1998/04/10 20:54:07
@@ -104,7 +104,8 @@
cd $(srcdir) && rm -f stamp-cat-id && echo timestamp > stamp-cat-id
-install: install-exec install-data
+#install: install-exec install-data
+install:
install-exec:
install-data: install-data-@USE_NLS@
install-data-no: all
Index: texinfo/util/Makefile.am
===================================================================
RCS file: /egcs/carton/cvsfiles/egcs/texinfo/util/Makefile.am,v
retrieving revision 1.3
diff -u -r1.3 Makefile.am
--- Makefile.am 1998/03/24 19:41:36 1.3
+++ Makefile.am 1998/04/10 20:54:07
@@ -2,8 +2,8 @@
## $Id: Makefile.am,v 1.3 1998/03/24 19:41:36 law Exp $
## Run automake in .. to produce Makefile.in from this.
-bin_PROGRAMS = install-info texindex
-bin_SCRIPTS = texi2dvi
+noinst_PROGRAMS = install-info texindex
+noinst_SCRIPTS = texi2dvi
localedir = $(datadir)/locale
INCLUDES = -I$(top_srcdir)/lib -I../intl -DLOCALEDIR=\"$(localedir)\"
^ permalink raw reply [flat|nested] 5+ messages in thread