From aa65cf04180e2595d6dfe16f34b005111373990b Mon Sep 17 00:00:00 2001 From: Bradley Bell Date: Sun, 14 Oct 2001 19:49:19 +0000 Subject: [PATCH] Minor dist fix --- Makefile.am | 10 ++++++---- arch/Makefile.am | 3 ++- iff/Makefile.am | 3 ++- input/Makefile.am | 3 ++- main/Makefile.am | 3 ++- 5 files changed, 14 insertions(+), 8 deletions(-) diff --git a/Makefile.am b/Makefile.am index 26171022..59f4eb05 100644 --- a/Makefile.am +++ b/Makefile.am @@ -4,15 +4,17 @@ EXTRA_SUBDIRS = includes tools unused dist-hook: list='$(EXTRA_SUBDIRS)'; for subdir in $$list; do \ - tar --exclude=CVS -cf - $$subdir | ( cd $(distdir) && tar xf - ) \ + ( cd $(srcdir) && tar --exclude=CVS/ -cf - $$subdir ) \ + | ( cd $(distdir) && tar xf - ) \ done $(MAKE) changelog cp -a ChangeLog $(distdir) changelog:: - -touch ChangeLog - -tools/cvs2cl/cvs2cl.pl -b --utc - -rm -f ChangeLog.bak + rm -f $(srcdir)/ChangeLog + touch $(srcdir)/ChangeLog + $(srcdir)/tools/cvs2cl/cvs2cl.pl -b --utc + rm -f ChangeLog.bak EXTRA_DIST = \ ChangeLog \ diff --git a/arch/Makefile.am b/arch/Makefile.am index 9e05f8b6..ad0e6ba0 100644 --- a/arch/Makefile.am +++ b/arch/Makefile.am @@ -44,5 +44,6 @@ dos_modex.asm dos_timer.asm dist-hook: list='$(EXTRA_SUBDIRS)'; for subdir in $$list; do \ - tar --exclude=CVS -cf - $$subdir | ( cd $(distdir) && tar xf - ) \ + ( cd $(srcdir) && tar --exclude=CVS -cf - $$subdir ) \ + | ( cd $(distdir) && tar xf - ) \ done diff --git a/iff/Makefile.am b/iff/Makefile.am index 84be250b..f3676b7b 100644 --- a/iff/Makefile.am +++ b/iff/Makefile.am @@ -7,5 +7,6 @@ libiff_a_SOURCES = iff.c dist-hook: list='$(EXTRA_SUBDIRS)'; for subdir in $$list; do \ - tar --exclude=CVS -cf - $$subdir | ( cd $(distdir) && tar xf - ) \ + ( cd $(srcdir) && tar --exclude=CVS -cf - $$subdir ) \ + | ( cd $(distdir) && tar xf - ) \ done diff --git a/input/Makefile.am b/input/Makefile.am index 7e957211..83c83705 100644 --- a/input/Makefile.am +++ b/input/Makefile.am @@ -46,5 +46,6 @@ ggi_init.c dist-hook: list='$(EXTRA_SUBDIRS)'; for subdir in $$list; do \ - tar --exclude=CVS -cf - $$subdir | ( cd $(distdir) && tar xf - ) \ + ( cd $(srcdir) && tar --exclude=CVS -cf - $$subdir ) \ + | ( cd $(distdir) && tar xf - ) \ done diff --git a/main/Makefile.am b/main/Makefile.am index 69d6cc4d..528f654b 100644 --- a/main/Makefile.am +++ b/main/Makefile.am @@ -58,5 +58,6 @@ dumpmine.c dist-hook: list='$(EXTRA_SUBDIRS)'; for subdir in $$list; do \ - tar --exclude=CVS -cf - $$subdir | ( cd $(distdir) && tar xf - ) \ + ( cd $(srcdir) && tar --exclude=CVS -cf - $$subdir ) \ + | ( cd $(distdir) && tar xf - ) \ done -- 2.39.2