From 25769e5efabb2af019b0ab7581d01d65ea08a175 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Tue, 25 Feb 1997 03:39:09 +0000 Subject: [PATCH] bug fix --- lib/am/texi-vers.am | 2 +- m4/Makefile.in | 36 ++++++++++++++++++++---------------- texi-vers.am | 8 +++----- version.texi | 2 +- 4 files changed, 25 insertions(+), 23 deletions(-) diff --git a/lib/am/texi-vers.am b/lib/am/texi-vers.am index f820131c..b617402b 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)/@VTEXI@ \ + cmp -s @VTI@.tmp $(srcdir)/stamp-@VTI@ \ || cp @VTI@.tmp $(srcdir)/stamp-@VTI@ rm -f @VTI@.tmp diff --git a/m4/Makefile.in b/m4/Makefile.in index 960c140b..6c385b00 100644 --- a/m4/Makefile.in +++ b/m4/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated automatically by automake 1.1g from Makefile.am +# Makefile.in generated automatically by automake 1.1m from Makefile.am # Copyright (C) 1994, 1995, 1996 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation @@ -37,8 +37,11 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +PACKAGE = @PACKAGE@ PERL = @PERL@ TAR = @TAR@ +VERSION = @VERSION@ AUTOMAKE_OPTIONS = gnits MAINT_CHARSET = latin1 @@ -56,28 +59,29 @@ DATA = $(m4data_DATA) DIST_COMMON = Makefile.am Makefile.in -PACKAGE = @PACKAGE@ -VERSION = @VERSION@ +DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) \ - $(TEXINFOS) $(MANS) $(EXTRA_DIST) +GZIP = --best default: all +.SUFFIXES: +$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL) + cd $(top_srcdir) && automake --gnits m4/Makefile -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in - cd $(top_srcdir) && automake --strictness=gnits $(subdir)/Makefile - -Makefile: $(top_builddir)/config.status $(srcdir)/Makefile.in $(BUILT_SOURCES) +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status + install-m4dataDATA: $(m4data_DATA) $(NORMAL_INSTALL) $(mkinstalldirs) $(m4datadir) - list="$(m4data_DATA)"; for p in $$list; do \ + @list="$(m4data_DATA)"; for p in $$list; do \ if test -f $(srcdir)/$$p; then \ + echo " $(INSTALL_DATA) $(srcdir)/$$p $(m4datadir)/$$p"; \ $(INSTALL_DATA) $(srcdir)/$$p $(m4datadir)/$$p; \ else if test -f $$p; then \ + echo " $(INSTALL_DATA) $$p $(m4datadir)/$$p"; \ $(INSTALL_DATA) $$p $(m4datadir)/$$p; \ fi; fi; \ done @@ -103,6 +107,7 @@ distdir: $(DISTFILES) info: dvi: check: all + $(MAKE) installcheck: install-exec: $(NORMAL_INSTALL) @@ -139,21 +144,20 @@ maintainer-clean-generic: test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) mostlyclean: mostlyclean-generic -clean: clean-generic mostlyclean +clean: clean-generic mostlyclean -distclean: distclean-generic clean +distclean: distclean-generic clean rm -f config.status -maintainer-clean: maintainer-clean-generic distclean +maintainer-clean: 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: default uninstall-m4dataDATA install-m4dataDATA tags distdir \ -info dvi check installcheck install-exec install-data install uninstall \ -all installdirs mostlyclean-generic distclean-generic clean-generic \ +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 -.SUFFIXES: # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/texi-vers.am b/texi-vers.am index 31322048..f820131c 100644 --- a/texi-vers.am +++ b/texi-vers.am @@ -28,11 +28,9 @@ 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. - if cmp -s @VTI@.tmp $(srcdir)/@VTEXI@; then \ - rm -f @VTI@.tmp; \ - else \ - cp @VTI@.tmp $(srcdir)/stamp-@VTI@; \ - fi + cmp -s @VTI@.tmp $(srcdir)/@VTEXI@ \ + || cp @VTI@.tmp $(srcdir)/stamp-@VTI@ + rm -f @VTI@.tmp mostlyclean-@VTI@: rm -f @VTI@.tmp diff --git a/version.texi b/version.texi index 975f8e5b..24e880b2 100644 --- a/version.texi +++ b/version.texi @@ -1,3 +1,3 @@ -@set UPDATED 23 February 1997 +@set UPDATED 24 February 1997 @set EDITION 1.1m @set VERSION 1.1m -- 2.43.5