From 4af4a9358d14cd2461636e3bc5f5640f0dd62ef1 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Fri, 28 Mar 1997 03:27:49 +0000 Subject: [PATCH] fix in texinfo version code --- Makefile.in | 46 +++++++++++++++++++++++++++------------------ aclocal.m4 | 11 +++++++---- configure | 38 +++++++++++++++++++++++-------------- lib/am/texi-vers.am | 2 +- m4/Makefile.in | 17 ++++++++++------- tests/Makefile.in | 14 ++++++++------ texi-vers.am | 2 +- 7 files changed, 79 insertions(+), 51 deletions(-) diff --git a/Makefile.in b/Makefile.in index 5732285e..0a41ca6b 100644 --- a/Makefile.in +++ b/Makefile.in @@ -43,10 +43,12 @@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ -NORMAL_INSTALL = @: -PRE_INSTALL = @: -POST_INSTALL = @: -INSTALL_SCRIPT = @INSTALL_SCRIPT@ +NORMAL_INSTALL = true +PRE_INSTALL = true +POST_INSTALL = true +NORMAL_UNINSTALL = true +PRE_UNINSTALL = true +POST_UNINSTALL = true PACKAGE = @PACKAGE@ PERL = @PERL@ TAR = @TAR@ @@ -125,7 +127,7 @@ aclocal: $(top_builddir)/config.status aclocal.in cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= ./config.status install-binSCRIPTS: $(bin_SCRIPTS) - $(NORMAL_INSTALL) + @$(NORMAL_INSTALL) $(mkinstalldirs) $(bindir) @list="$(bin_SCRIPTS)"; for p in $$list; do \ if test -f $$p; then \ @@ -138,12 +140,13 @@ install-binSCRIPTS: $(bin_SCRIPTS) done uninstall-binSCRIPTS: + $(NORMAL_UNINSTALL) list="$(bin_SCRIPTS)"; for p in $$list; do \ rm -f $(bindir)/`echo $$p|sed '$(transform)'`; \ done install-pkgdataSCRIPTS: $(pkgdata_SCRIPTS) - $(NORMAL_INSTALL) + @$(NORMAL_INSTALL) $(mkinstalldirs) $(pkgdatadir) @list="$(pkgdata_SCRIPTS)"; for p in $$list; do \ if test -f $$p; then \ @@ -156,6 +159,7 @@ install-pkgdataSCRIPTS: $(pkgdata_SCRIPTS) done uninstall-pkgdataSCRIPTS: + $(NORMAL_UNINSTALL) list="$(pkgdata_SCRIPTS)"; for p in $$list; do \ rm -f $(pkgdatadir)/`echo $$p|sed '$(transform)'`; \ done @@ -164,13 +168,14 @@ version.texi: stamp-vti cp $(srcdir)/stamp-vti $(srcdir)/version.texi stamp-vti: automake.texi $(top_srcdir)/configure.in - echo "@set UPDATED `cd $(srcdir) \ + @echo "@set UPDATED `cd $(srcdir) \ && $(SHELL) ./mdate-sh automake.texi`" > vti.tmp - echo "@set EDITION $(VERSION)" >> vti.tmp - echo "@set VERSION $(VERSION)" >> vti.tmp - cmp -s vti.tmp $(srcdir)/stamp-vti \ - || cp vti.tmp $(srcdir)/stamp-vti - rm -f vti.tmp + @echo "@set EDITION $(VERSION)" >> vti.tmp + @echo "@set VERSION $(VERSION)" >> vti.tmp + @cmp -s vti.tmp $(srcdir)/stamp-vti \ + || (echo "Updating $(srcdir)/stamp-vti"; \ + cp vti.tmp $(srcdir)/stamp-vti) + @rm -f vti.tmp mostlyclean-vti: rm -f vti.tmp @@ -215,7 +220,7 @@ DVIPS = dvips $(DVIPS) $< -o $@ install-info-am: $(INFO_DEPS) - $(NORMAL_INSTALL) + @$(NORMAL_INSTALL) $(mkinstalldirs) $(infodir) @for file in $(INFO_DEPS); do \ for ifile in `cd $(srcdir) && echo $$file $$file-[0-9] $$file-[0-9][0-9]`; do \ @@ -225,7 +230,7 @@ install-info-am: $(INFO_DEPS) else : ; fi; \ done; \ done - $(POST_INSTALL) + @$(POST_INSTALL) @if $(SHELL) -c 'install-info --version' >/dev/null 2>&1; then \ for file in $(INFO_DEPS); do \ echo " install-info --info-dir=$(infodir) $(infodir)/$$file";\ @@ -234,13 +239,17 @@ install-info-am: $(INFO_DEPS) else : ; fi uninstall-info: + $(PRE_UNINSTALL) if $(SHELL) -c 'install-info --version' >/dev/null 2>&1; then \ ii=yes; \ else ii=; fi; \ for file in $(INFO_DEPS); do \ - (cd $(infodir) && rm -f $$file $$file-[0-9] $$file-[0-9][0-9]); \ test -z $ii || install-info --info-dir=$(infodir) --remove $$file; \ done + $(NORMAL_UNINSTALL) + for file in $(INFO_DEPS); do \ + (cd $(infodir) && rm -f $$file $$file-[0-9] $$file-[0-9][0-9]); \ + done dist-info: $(INFO_DEPS) for base in $(INFO_DEPS); do \ @@ -266,7 +275,7 @@ maintainer-clean-info: for i in $(INFO_DEPS); do rm -f `eval echo $$i*`; done install-pkgdataDATA: $(pkgdata_DATA) - $(NORMAL_INSTALL) + @$(NORMAL_INSTALL) $(mkinstalldirs) $(pkgdatadir) @list="$(pkgdata_DATA)"; for p in $$list; do \ if test -f $(srcdir)/$$p; then \ @@ -279,6 +288,7 @@ install-pkgdataDATA: $(pkgdata_DATA) done uninstall-pkgdataDATA: + $(NORMAL_UNINSTALL) list="$(pkgdata_DATA)"; for p in $$list; do \ rm -f $(pkgdatadir)/$$p; \ done @@ -401,10 +411,10 @@ install-data-am: install-info-am install-pkgdataSCRIPTS install-pkgdataDATA uninstall-am: uninstall-binSCRIPTS uninstall-pkgdataSCRIPTS uninstall-info uninstall-pkgdataDATA install-exec: install-exec-recursive install-exec-am - $(NORMAL_INSTALL) + @$(NORMAL_INSTALL) install-data: install-data-recursive install-data-am - $(NORMAL_INSTALL) + @$(NORMAL_INSTALL) install: install-recursive install-exec-am install-data-am @: diff --git a/aclocal.m4 b/aclocal.m4 index 06d5d728..c6a9516c 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -7,16 +7,17 @@ dnl aclocal.m4 generated automatically by aclocal 1.1n # serial 1 dnl Usage: -dnl AM_INIT_AUTOMAKE(package,version) +dnl AM_INIT_AUTOMAKE(package,version, [no-define]) AC_DEFUN(AM_INIT_AUTOMAKE, [AC_REQUIRE([AM_PROG_INSTALL]) PACKAGE=[$1] AC_SUBST(PACKAGE) -AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE") VERSION=[$2] AC_SUBST(VERSION) -AC_DEFINE_UNQUOTED(VERSION, "$VERSION") +ifelse([$3],, +AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE") +AC_DEFINE_UNQUOTED(VERSION, "$VERSION")) AM_SANITY_CHECK AC_ARG_PROGRAM dnl FIXME This is truly gross. @@ -73,7 +74,9 @@ dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY) dnl The program must properly implement --version. AC_DEFUN(AM_MISSING_PROG, [AC_MSG_CHECKING(for working $2) -if $2 --version > /dev/null 2>&1; then +# Run test in a subshell; some versions of sh will print an error if +# an executable is not found, even if stderr is redirected. +if ($2 --version) > /dev/null 2>&1; then $1=$2 AC_MSG_RESULT(found) else diff --git a/configure b/configure index d1c56645..abf1c542 100755 --- a/configure +++ b/configure @@ -604,12 +604,12 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' PACKAGE=automake +VERSION=1.1n + cat >> confdefs.h <> confdefs.h <&6 echo "configure:666: checking for working aclocal" >&5 -if aclocal --version > /dev/null 2>&1; then +# Run test in a subshell; some versions of sh will print an error if +# an executable is not found, even if stderr is redirected. +if (aclocal --version) > /dev/null 2>&1; then ACLOCAL=aclocal echo "$ac_t""found" 1>&6 else @@ -672,8 +674,10 @@ else fi echo $ac_n "checking for working autoconf""... $ac_c" 1>&6 -echo "configure:676: checking for working autoconf" >&5 -if autoconf --version > /dev/null 2>&1; then +echo "configure:678: checking for working autoconf" >&5 +# Run test in a subshell; some versions of sh will print an error if +# an executable is not found, even if stderr is redirected. +if (autoconf --version) > /dev/null 2>&1; then AUTOCONF=autoconf echo "$ac_t""found" 1>&6 else @@ -682,8 +686,10 @@ else fi echo $ac_n "checking for working automake""... $ac_c" 1>&6 -echo "configure:686: checking for working automake" >&5 -if automake --version > /dev/null 2>&1; then +echo "configure:690: checking for working automake" >&5 +# Run test in a subshell; some versions of sh will print an error if +# an executable is not found, even if stderr is redirected. +if (automake --version) > /dev/null 2>&1; then AUTOMAKE=automake echo "$ac_t""found" 1>&6 else @@ -692,8 +698,10 @@ else fi echo $ac_n "checking for working autoheader""... $ac_c" 1>&6 -echo "configure:696: checking for working autoheader" >&5 -if autoheader --version > /dev/null 2>&1; then +echo "configure:702: checking for working autoheader" >&5 +# Run test in a subshell; some versions of sh will print an error if +# an executable is not found, even if stderr is redirected. +if (autoheader --version) > /dev/null 2>&1; then AUTOHEADER=autoheader echo "$ac_t""found" 1>&6 else @@ -702,8 +710,10 @@ else fi echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6 -echo "configure:706: checking for working makeinfo" >&5 -if makeinfo --version > /dev/null 2>&1; then +echo "configure:714: checking for working makeinfo" >&5 +# Run test in a subshell; some versions of sh will print an error if +# an executable is not found, even if stderr is redirected. +if (makeinfo --version) > /dev/null 2>&1; then MAKEINFO=makeinfo echo "$ac_t""found" 1>&6 else @@ -712,7 +722,7 @@ else fi echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:716: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:726: checking whether ${MAKE-make} sets \${MAKE}" >&5 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -746,7 +756,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:750: checking for $ac_word" >&5 +echo "configure:760: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_TAR'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -777,7 +787,7 @@ done # Extract the first word of "perl", so it can be a program name with args. set dummy perl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:781: checking for $ac_word" >&5 +echo "configure:791: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_PERL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else diff --git a/lib/am/texi-vers.am b/lib/am/texi-vers.am index 6f0c18ef..42e33ead 100644 --- a/lib/am/texi-vers.am +++ b/lib/am/texi-vers.am @@ -28,7 +28,7 @@ stamp-@VTI@: @TEXI@ $(top_srcdir)/configure.in ## Use cp and rm here because some older "mv"s can't move across ## filesystems. Furthermore, GNU "mv" in the AmigaDOS environment ## can't handle this. - @cmp -s @VTI@.tmp $(srcdir)/stamp-@VTI@ + @cmp -s @VTI@.tmp $(srcdir)/stamp-@VTI@ \ || (echo "Updating $(srcdir)/stamp-@VTI@"; \ cp @VTI@.tmp $(srcdir)/stamp-@VTI@) @rm -f @VTI@.tmp diff --git a/m4/Makefile.in b/m4/Makefile.in index 3b5b6ad2..a4441662 100644 --- a/m4/Makefile.in +++ b/m4/Makefile.in @@ -43,10 +43,12 @@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ -NORMAL_INSTALL = @: -PRE_INSTALL = @: -POST_INSTALL = @: -INSTALL_SCRIPT = @INSTALL_SCRIPT@ +NORMAL_INSTALL = true +PRE_INSTALL = true +POST_INSTALL = true +NORMAL_UNINSTALL = true +PRE_UNINSTALL = true +POST_UNINSTALL = true PACKAGE = @PACKAGE@ PERL = @PERL@ TAR = @TAR@ @@ -84,7 +86,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) install-m4dataDATA: $(m4data_DATA) - $(NORMAL_INSTALL) + @$(NORMAL_INSTALL) $(mkinstalldirs) $(m4datadir) @list="$(m4data_DATA)"; for p in $$list; do \ if test -f $(srcdir)/$$p; then \ @@ -97,6 +99,7 @@ install-m4dataDATA: $(m4data_DATA) done uninstall-m4dataDATA: + $(NORMAL_UNINSTALL) list="$(m4data_DATA)"; for p in $$list; do \ rm -f $(m4datadir)/$$p; \ done @@ -120,10 +123,10 @@ check: all $(MAKE) installcheck: install-exec: - $(NORMAL_INSTALL) + @$(NORMAL_INSTALL) install-data: install-m4dataDATA - $(NORMAL_INSTALL) + @$(NORMAL_INSTALL) install: install-exec install-data all @: diff --git a/tests/Makefile.in b/tests/Makefile.in index e146524c..53128fe0 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -43,10 +43,12 @@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ -NORMAL_INSTALL = @: -PRE_INSTALL = @: -POST_INSTALL = @: -INSTALL_SCRIPT = @INSTALL_SCRIPT@ +NORMAL_INSTALL = true +PRE_INSTALL = true +POST_INSTALL = true +NORMAL_UNINSTALL = true +PRE_UNINSTALL = true +POST_UNINSTALL = true PACKAGE = @PACKAGE@ PERL = @PERL@ TAR = @TAR@ @@ -139,10 +141,10 @@ check: all $(MAKE) check-TESTS installcheck: install-exec: - $(NORMAL_INSTALL) + @$(NORMAL_INSTALL) install-data: - $(NORMAL_INSTALL) + @$(NORMAL_INSTALL) install: install-exec install-data all @: diff --git a/texi-vers.am b/texi-vers.am index 6f0c18ef..42e33ead 100644 --- a/texi-vers.am +++ b/texi-vers.am @@ -28,7 +28,7 @@ stamp-@VTI@: @TEXI@ $(top_srcdir)/configure.in ## Use cp and rm here because some older "mv"s can't move across ## filesystems. Furthermore, GNU "mv" in the AmigaDOS environment ## can't handle this. - @cmp -s @VTI@.tmp $(srcdir)/stamp-@VTI@ + @cmp -s @VTI@.tmp $(srcdir)/stamp-@VTI@ \ || (echo "Updating $(srcdir)/stamp-@VTI@"; \ cp @VTI@.tmp $(srcdir)/stamp-@VTI@) @rm -f @VTI@.tmp -- 2.43.5