From aa505475b455de3435361c05ee84a0a4e03c4a13 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Fri, 8 Nov 1996 22:31:40 +0000 Subject: [PATCH] fixlets --- Makefile.in | 29 +++++++++++++++++++---------- automake.in | 2 +- lib/am/texinfos.am | 6 +++--- m4/Makefile.in | 15 +++++++-------- tests/Makefile.in | 15 +++++++-------- texinfos.am | 6 +++--- 6 files changed, 40 insertions(+), 33 deletions(-) diff --git a/Makefile.in b/Makefile.in index d691e94e..3a944267 100644 --- a/Makefile.in +++ b/Makefile.in @@ -72,7 +72,6 @@ SCRIPTS = $(bin_SCRIPTS) $(pkgdata_SCRIPTS) MAKEINFO = makeinfo TEXI2DVI = texi2dvi -INFOS = automake.info automake.info[-0-9]* INFO_DEPS = automake.info DVIS = automake.dvi TEXINFOS = automake.texi @@ -89,9 +88,7 @@ PACKAGE = @PACKAGE@ VERSION = @VERSION@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) \ - $(TEXINFOS) $(INFOS) $(MANS) $(EXTRA_DIST) -DEP_DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) \ - $(TEXINFOS) $(INFO_DEPS) $(MANS) $(EXTRA_DIST) + $(TEXINFOS) $(MANS) $(EXTRA_DIST) TAR = tar default: all @@ -100,7 +97,7 @@ aclocal.m4: configure.in cd $(srcdir) && aclocal $(srcdir)/Makefile.in: Makefile.am configure.in - cd $(srcdir) && automake --strictness=@STRICTNESS@ Makefile + cd $(srcdir) && automake --strictness=gnits Makefile # For an explanation of the following Makefile rules, see node # `Automatic Remaking' in GNU Autoconf documentation. @@ -215,6 +212,16 @@ uninstall-info: test -z $ii || install-info --info-dir=$(infodir) --remove $$file; \ done +dist-info: $(INFO_DEPS) + for base in $(INFO_DEPS); do \ + d=$(srcdir); \ + for file in `cd $$d && eval echo $$base*`; do \ + test -f $(distdir)/$$file \ + || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ + || cp -p $$d/$$file $(distdir)/$$file; \ + done; \ + done + mostlyclean-info: rm -f automake.aux automake.cp automake.cps automake.dvi automake.fn \ automake.fns automake.ky automake.log automake.pg \ @@ -225,7 +232,7 @@ clean-info: distclean-info: maintainer-clean-info: - rm -f $(INFOS) + for i in $(INFO_DEPS); do rm `eval echo $i*`; done install-pkgdataDATA: $(pkgdata_DATA) $(NORMAL_INSTALL) @@ -319,7 +326,7 @@ dist-all: distdir -chmod -R a+r $(distdir) $(TAR) chozf $(distdir).tar.gz $(distdir) rm -rf $(distdir) -distdir: $(DEP_DISTFILES) +distdir: $(DISTFILES) @if sed 15q $(srcdir)/NEWS | fgrep -e "$(VERSION)" > /dev/null; then :; else \ echo "NEWS not updated; not releasing" 1>&2; \ exit 1; \ @@ -330,10 +337,11 @@ distdir: $(DEP_DISTFILES) here=`pwd`; distdir=`cd $(distdir) && pwd` \ && cd $(srcdir) \ && automake --include-deps --build-dir=$$here --srcdir-name=$(srcdir) --output-dir=$$distdir --strictness=gnits - @for file in `cd $(srcdir) && echo $(DISTFILES)`; do \ + @for file in $(DISTFILES); do \ + d=$(srcdir); \ test -f $(distdir)/$$file \ - || ln $(srcdir)/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $(srcdir)/$$file $(distdir)/$$file; \ + || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ + || cp -p $$d/$$file $(distdir)/$$file; \ done for subdir in $(SUBDIRS); do \ test -d $(distdir)/$$subdir \ @@ -343,6 +351,7 @@ distdir: $(DEP_DISTFILES) (cd $$subdir && $(MAKE) distdir=../$(distdir)/$$subdir distdir) \ || exit 1; \ done + $(MAKE) distdir="$(distdir)" dist-info info: $(INFO_DEPS) info-recursive dvi: $(DVIS) dvi-recursive check: all-am diff --git a/automake.in b/automake.in index 6b887f4f..c5920474 100755 --- a/automake.in +++ b/automake.in @@ -1819,7 +1819,7 @@ sub handle_dist_worker foreach $targ (@dist_targets) { # We must explicitly set distdir for these sub-makes. - $output_rules .= "\t\$(MAKE) distdir=\"$(distdir)\" $targ\n"; + $output_rules .= "\t\$(MAKE) distdir=\"\$(distdir)\" $targ\n"; } push (@phony, 'distdir'); diff --git a/lib/am/texinfos.am b/lib/am/texinfos.am index 59a63c0b..395c9fce 100644 --- a/lib/am/texinfos.am +++ b/lib/am/texinfos.am @@ -81,7 +81,7 @@ uninstall-info: test -z $ii || install-info --info-dir=$(infodir) --remove $$file; \ done -dist-info: +dist-info: $(INFO_DEPS) for base in $(INFO_DEPS); do \ ## In Cygnus mode, allow info file to be in source or build dir. In ## other modes, allow only source dir. @@ -89,7 +89,7 @@ NOTCYGNUS d=$(srcdir); \ CYGNUS if test -f $$base; then d=.; else d=$(srcdir); fi; \ for file in `cd $$d && eval echo $$base*`; do \ test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \\ - || cp -p $$d/$$file $(distdir)/$$file; \\ + || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ + || cp -p $$d/$$file $(distdir)/$$file; \ done; \ done diff --git a/m4/Makefile.in b/m4/Makefile.in index 2a2bbaff..44019aad 100644 --- a/m4/Makefile.in +++ b/m4/Makefile.in @@ -59,16 +59,14 @@ PACKAGE = @PACKAGE@ VERSION = @VERSION@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) \ - $(TEXINFOS) $(INFOS) $(MANS) $(EXTRA_DIST) -DEP_DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) \ - $(TEXINFOS) $(INFO_DEPS) $(MANS) $(EXTRA_DIST) + $(TEXINFOS) $(MANS) $(EXTRA_DIST) TAR = tar default: all $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in - cd $(top_srcdir) && automake $(subdir)/Makefile + cd $(top_srcdir) && automake --strictness=gnits $(subdir)/Makefile Makefile: $(top_builddir)/config.status $(srcdir)/Makefile.in $(BUILT_SOURCES) cd $(top_builddir) \ @@ -96,11 +94,12 @@ TAGS: distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) subdir = m4 -distdir: $(DEP_DISTFILES) - @for file in `cd $(srcdir) && echo $(DISTFILES)`; do \ +distdir: $(DISTFILES) + @for file in $(DISTFILES); do \ + d=$(srcdir); \ test -f $(distdir)/$$file \ - || ln $(srcdir)/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $(srcdir)/$$file $(distdir)/$$file; \ + || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ + || cp -p $$d/$$file $(distdir)/$$file; \ done info: dvi: diff --git a/tests/Makefile.in b/tests/Makefile.in index 7588cc58..05c2ceb3 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -69,16 +69,14 @@ PACKAGE = @PACKAGE@ VERSION = @VERSION@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) \ - $(TEXINFOS) $(INFOS) $(MANS) $(EXTRA_DIST) -DEP_DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) \ - $(TEXINFOS) $(INFO_DEPS) $(MANS) $(EXTRA_DIST) + $(TEXINFOS) $(MANS) $(EXTRA_DIST) TAR = tar default: all $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in - cd $(top_srcdir) && automake $(subdir)/Makefile + cd $(top_srcdir) && automake --strictness=gnits $(subdir)/Makefile Makefile: $(top_builddir)/config.status $(srcdir)/Makefile.in $(BUILT_SOURCES) cd $(top_builddir) \ @@ -90,11 +88,12 @@ TAGS: distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) subdir = tests -distdir: $(DEP_DISTFILES) - @for file in `cd $(srcdir) && echo $(DISTFILES)`; do \ +distdir: $(DISTFILES) + @for file in $(DISTFILES); do \ + d=$(srcdir); \ test -f $(distdir)/$$file \ - || ln $(srcdir)/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $(srcdir)/$$file $(distdir)/$$file; \ + || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ + || cp -p $$d/$$file $(distdir)/$$file; \ done check-TESTS: $(TESTS) @failed=0; all=0; \ diff --git a/texinfos.am b/texinfos.am index 59a63c0b..395c9fce 100644 --- a/texinfos.am +++ b/texinfos.am @@ -81,7 +81,7 @@ uninstall-info: test -z $ii || install-info --info-dir=$(infodir) --remove $$file; \ done -dist-info: +dist-info: $(INFO_DEPS) for base in $(INFO_DEPS); do \ ## In Cygnus mode, allow info file to be in source or build dir. In ## other modes, allow only source dir. @@ -89,7 +89,7 @@ NOTCYGNUS d=$(srcdir); \ CYGNUS if test -f $$base; then d=.; else d=$(srcdir); fi; \ for file in `cd $$d && eval echo $$base*`; do \ test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \\ - || cp -p $$d/$$file $(distdir)/$$file; \\ + || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ + || cp -p $$d/$$file $(distdir)/$$file; \ done; \ done -- 2.43.5