From 239620cc7a92e4e6953292211a2b774c7ce6906f Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Wed, 2 Dec 1998 12:16:32 +0000 Subject: [PATCH] * Makefile.am (cvs-dist): Run `cvs tag' operation in srcdir. --- ChangeLog | 2 ++ Makefile.am | 2 +- Makefile.in | 26 ++++++++------------------ lib/am/Makefile.am | 2 +- 4 files changed, 12 insertions(+), 20 deletions(-) diff --git a/ChangeLog b/ChangeLog index 25bb7a2..11e6a27 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ 1998-12-02 Tom Tromey + * Makefile.am (cvs-dist): Run `cvs tag' operation in srcdir. + Some bugs from François Pinard: * automake.in (usage): Remove duplicates in file list. diff --git a/Makefile.am b/Makefile.am index e0414c6..6533dcf 100644 --- a/Makefile.am +++ b/Makefile.am @@ -99,7 +99,7 @@ cvs-dist: maintainer-check perl4-check distcheck echo "NEWS not updated; not releasing" 1>&2; \ exit 1; \ fi - cvs -q tag `echo "Release-$(VERSION)" | sed 's/\./-/g'` + cd $(srcdir) && cvs -q tag `echo "Release-$(VERSION)" | sed 's/\./-/g'` $(MAKE) dist cvs-diff: diff --git a/Makefile.in b/Makefile.in index 5b22f37..55b314d 100644 --- a/Makefile.in +++ b/Makefile.in @@ -71,25 +71,15 @@ SUBDIRS = . m4 tests bin_SCRIPTS = automake aclocal info_TEXINFOS = automake.texi -amfiles = clean-hdr.am clean-kr.am clean.am comp-vars.am compile.am \ -data-clean.am data.am dejagnu.am depend.am depend2.am dist-vars.am \ -footer.am header-vars.am header.am java-clean.am java.am kr-extra.am \ -library.am libs-clean.am libs.am libtool.am lisp-clean.am lisp.am \ -ltlib-clean.am ltlib.am ltlibrary.am mans-vars.am mans.am multilib.am \ -program.am progs-clean.am progs.am remake-hdr.am remake.am scripts.am \ -subdirs.am tags-clean.am tags.am texi-vers.am texinfos.am +amfiles = clean-hdr.am clean-kr.am clean.am comp-vars.am compile.am data-clean.am data.am dejagnu.am depend.am depend2.am dist-vars.am footer.am header-vars.am header.am java-clean.am java.am kr-extra.am library.am libs-clean.am libs.am libtool.am lisp-clean.am lisp.am ltlib-clean.am ltlib.am ltlibrary.am mans-vars.am mans.am multilib.am program.am progs-clean.am progs.am remake-hdr.am remake.am scripts.am subdirs.am tags-clean.am tags.am texi-vers.am texinfos.am + pkgdata_DATA = COPYING INSTALL texinfo.tex ansi2knr.c ansi2knr.1 $(amfiles) -pkgdata_SCRIPTS = config.guess config.sub install-sh mdate-sh missing \ -mkinstalldirs elisp-comp ylwrap acinstall +pkgdata_SCRIPTS = config.guess config.sub install-sh mdate-sh missing mkinstalldirs elisp-comp ylwrap acinstall -EXTRA_DIST = acinstall $(pkgdata_DATA) -# The following requires a fixed version of the Emacs 19.30 etags. -ETAGS_ARGS = automake.in aclocal.in --lang=none \ - --regex='/^@node[ \t]+\([^,]+\)/\1/' automake.texi -TAGS_DEPENDENCIES = automake.in aclocal.in automake.texi +EXTRA_DIST = acinstall $(pkgdata_DATA) ETAGS_ARGS = $(amfiles) TAGS_DEPENDENCIES = $(ETAGS_ARGS) @@ -476,7 +466,7 @@ distdir: $(DISTFILES) fi; \ done for subdir in $(SUBDIRS); do \ - if test "$$srcdir" = .; then :; else \ + if test "$$subdir" = .; then :; else \ test -d $(distdir)/$$subdir \ || mkdir $(distdir)/$$subdir \ || exit 1; \ @@ -538,18 +528,18 @@ clean: clean-recursive distclean-am: distclean-vti distclean-aminfo distclean-tags \ distclean-generic clean-am - -rm -f config.status distclean: distclean-recursive + -rm -f config.status maintainer-clean-am: maintainer-clean-vti maintainer-clean-aminfo \ maintainer-clean-tags maintainer-clean-generic \ distclean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." - -rm -f config.status maintainer-clean: maintainer-clean-recursive + -rm -f config.status .PHONY: uninstall-binSCRIPTS install-binSCRIPTS uninstall-pkgdataSCRIPTS \ install-pkgdataSCRIPTS mostlyclean-vti distclean-vti clean-vti \ @@ -621,7 +611,7 @@ cvs-dist: maintainer-check perl4-check distcheck echo "NEWS not updated; not releasing" 1>&2; \ exit 1; \ fi - cvs -q tag `echo "Release-$(VERSION)" | sed 's/\./-/g'` + cd $(srcdir) && cvs -q tag `echo "Release-$(VERSION)" | sed 's/\./-/g'` $(MAKE) dist cvs-diff: diff --git a/lib/am/Makefile.am b/lib/am/Makefile.am index e0414c6..6533dcf 100644 --- a/lib/am/Makefile.am +++ b/lib/am/Makefile.am @@ -99,7 +99,7 @@ cvs-dist: maintainer-check perl4-check distcheck echo "NEWS not updated; not releasing" 1>&2; \ exit 1; \ fi - cvs -q tag `echo "Release-$(VERSION)" | sed 's/\./-/g'` + cd $(srcdir) && cvs -q tag `echo "Release-$(VERSION)" | sed 's/\./-/g'` $(MAKE) dist cvs-diff: -- 2.7.4