diff options
Diffstat (limited to 'texinfo')
| -rw-r--r-- | texinfo/ChangeLog | 7 | ||||
| -rw-r--r-- | texinfo/util/Makefile.am | 4 | ||||
| -rw-r--r-- | texinfo/util/Makefile.in | 87 |
3 files changed, 34 insertions, 64 deletions
diff --git a/texinfo/ChangeLog b/texinfo/ChangeLog index 38b56c2..78f6596 100644 --- a/texinfo/ChangeLog +++ b/texinfo/ChangeLog @@ -1,3 +1,10 @@ +1999-02-01 Manfred Hollstein <manfred@s-direktnet.de> + + * util/Makefile.am (noinst_PROGRAMS): Renamed from "bin_PROGRAMS" + to avoid installing anything. + (noinst_SCRIPTS): Likewise. + * util/Makefile.in: Regenerate using automake-1.3. + 1999-01-21 Gerald Pfeifer <pfeifer@dbai.tuwien.ac.at> * Makefile.am (SUBDIRS): Include util again in order to generate diff --git a/texinfo/util/Makefile.am b/texinfo/util/Makefile.am index de4d0db..2f66f51 100644 --- a/texinfo/util/Makefile.am +++ b/texinfo/util/Makefile.am @@ -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)\" diff --git a/texinfo/util/Makefile.in b/texinfo/util/Makefile.in index 71ac608..5927d4e 100644 --- a/texinfo/util/Makefile.in +++ b/texinfo/util/Makefile.in @@ -90,8 +90,8 @@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ l = @l@ -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)\" @@ -102,8 +102,8 @@ EXTRA_DIST = README deref.c fixfonts gen-dir-node tex3patch texi2dvi \ mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs CONFIG_HEADER = ../config.h CONFIG_CLEAN_FILES = -bin_PROGRAMS = install-info$(EXEEXT) texindex$(EXEEXT) -PROGRAMS = $(bin_PROGRAMS) +noinst_PROGRAMS = install-info$(EXEEXT) texindex$(EXEEXT) +PROGRAMS = $(noinst_PROGRAMS) DEFS = @DEFS@ -I. -I$(srcdir) -I.. @@ -120,7 +120,7 @@ texindex_OBJECTS = texindex.o texindex_LDADD = $(LDADD) texindex_DEPENDENCIES = ../lib/libtxi.a texindex_LDFLAGS = -SCRIPTS = $(bin_SCRIPTS) +SCRIPTS = $(noinst_SCRIPTS) CFLAGS = @CFLAGS@ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) @@ -147,30 +147,14 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status -mostlyclean-binPROGRAMS: +mostlyclean-noinstPROGRAMS: -clean-binPROGRAMS: - -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS) +clean-noinstPROGRAMS: + -test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS) -distclean-binPROGRAMS: +distclean-noinstPROGRAMS: -maintainer-clean-binPROGRAMS: - -install-binPROGRAMS: $(bin_PROGRAMS) - @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(bindir) - @list='$(bin_PROGRAMS)'; for p in $$list; do \ - if test -f $$p; then \ - echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`"; \ - $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \ - else :; fi; \ - done - -uninstall-binPROGRAMS: - @$(NORMAL_UNINSTALL) - list='$(bin_PROGRAMS)'; for p in $$list; do \ - rm -f $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \ - done +maintainer-clean-noinstPROGRAMS: .c.o: $(COMPILE) -c $< @@ -199,25 +183,6 @@ texindex$(EXEEXT): $(texindex_OBJECTS) $(texindex_DEPENDENCIES) @rm -f texindex$(EXEEXT) $(LINK) $(texindex_LDFLAGS) $(texindex_OBJECTS) $(texindex_LDADD) $(LIBS) -install-binSCRIPTS: $(bin_SCRIPTS) - @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(bindir) - @list='$(bin_SCRIPTS)'; for p in $$list; do \ - if test -f $$p; then \ - echo " $(INSTALL_SCRIPT) $$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`"; \ - $(INSTALL_SCRIPT) $$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \ - else if test -f $(srcdir)/$$p; then \ - echo " $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`"; \ - $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \ - else :; fi; fi; \ - done - -uninstall-binSCRIPTS: - @$(NORMAL_UNINSTALL) - list='$(bin_SCRIPTS)'; for p in $$list; do \ - rm -f $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \ - done - tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) @@ -259,7 +224,7 @@ dvi: check: all $(MAKE) installcheck: -install-exec: install-binPROGRAMS install-binSCRIPTS +install-exec: @$(NORMAL_INSTALL) install-data: @@ -268,12 +233,11 @@ install-data: install: install-exec install-data all @: -uninstall: uninstall-binPROGRAMS uninstall-binSCRIPTS +uninstall: install-strip: $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install installdirs: - $(mkinstalldirs) $(DATADIR)$(bindir) $(DATADIR)$(bindir) mostlyclean-generic: @@ -290,31 +254,30 @@ distclean-generic: maintainer-clean-generic: -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) -mostlyclean: mostlyclean-binPROGRAMS mostlyclean-compile \ +mostlyclean: mostlyclean-noinstPROGRAMS mostlyclean-compile \ mostlyclean-tags mostlyclean-generic -clean: clean-binPROGRAMS clean-compile clean-tags clean-generic \ +clean: clean-noinstPROGRAMS clean-compile clean-tags clean-generic \ mostlyclean -distclean: distclean-binPROGRAMS distclean-compile distclean-tags \ +distclean: distclean-noinstPROGRAMS distclean-compile distclean-tags \ distclean-generic clean -rm -f config.status -maintainer-clean: maintainer-clean-binPROGRAMS maintainer-clean-compile \ - maintainer-clean-tags maintainer-clean-generic \ - distclean +maintainer-clean: maintainer-clean-noinstPROGRAMS \ + maintainer-clean-compile maintainer-clean-tags \ + maintainer-clean-generic distclean @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." -.PHONY: mostlyclean-binPROGRAMS distclean-binPROGRAMS clean-binPROGRAMS \ -maintainer-clean-binPROGRAMS uninstall-binPROGRAMS install-binPROGRAMS \ +.PHONY: mostlyclean-noinstPROGRAMS distclean-noinstPROGRAMS \ +clean-noinstPROGRAMS maintainer-clean-noinstPROGRAMS \ mostlyclean-compile distclean-compile clean-compile \ -maintainer-clean-compile uninstall-binSCRIPTS install-binSCRIPTS tags \ -mostlyclean-tags distclean-tags clean-tags maintainer-clean-tags \ -distdir info dvi installcheck install-exec install-data install \ -uninstall all installdirs mostlyclean-generic distclean-generic \ -clean-generic maintainer-clean-generic clean mostlyclean distclean \ -maintainer-clean +maintainer-clean-compile tags mostlyclean-tags distclean-tags \ +clean-tags maintainer-clean-tags distdir info dvi installcheck \ +install-exec install-data install uninstall all installdirs \ +mostlyclean-generic distclean-generic clean-generic \ +maintainer-clean-generic clean mostlyclean distclean maintainer-clean # Tell versions [3.59,3.63) of GNU make to not export all variables. |