ChangeLog, Makefile.in:

  Fix up makefile to work in new CVS development environment.

diff --git a/ChangeLog b/ChangeLog
index d13fc23..a9e2d0c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu May  8 22:23:49 1997  Theodore Ts'o  <tytso@rsts-11.mit.edu>
+
+       * Makefile.in (source_tar_file): Fix up makefile to work in new
+               CVS development environment.
+
 Thu Apr 24 12:16:42 1997  Theodre Ts'o  <tytso@localhost.mit.edu>
 
        * Release of E2fsprogs version 1.10

diff --git a/Makefile.in b/Makefile.in
index 49ce460..7aaa97b 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -93,17 +93,18 @@ SRCROOT = `echo e2fsprogs-@E2FSPROGS_VERSION@ | sed -e 's/-WIP//' \
                                        -e 's/pre-//'`
 
 $(srcdir)/.exclude-file:
-       (cd $(srcdir)/.. ; find $(SRCROOT) \( -name \*~ -o -name \*.orig \
-               -o -name \*.rej \) -print > $(SRCROOT)/.exclude-file)
+       (cd $(srcdir)/.. ; find e2fsprogs \( -name \*~ -o -name \*.orig \
+               -o -name CVS -o -name \*.rej \) -print \
+               > $(srcdir)/.exclude-file)
        echo "$(SRCROOT)/build" >> $(srcdir)/.exclude-file
        echo "$(SRCROOT)/rpm.log" >> $(srcdir)/.exclude-file
        echo "$(SRCROOT)/.exclude-file" >> $(srcdir)/.exclude-file
        echo $(SRCROOT)/e2fsprogs-@E2FSPROGS_VERSION@.tar.gz \
                >> $(srcdir)/.exclude-file
        
-
 source_tar_file: $(srcdir)/.exclude-file
-       (cd $(srcdir) ; $(TAR) -C .. -c -v -f - \
-               -X .exclude-file $(SRCROOT) | \
+       (cd $(srcdir)/..; a=$(SRCROOT); rm -f $$a ; ln -sf e2fsprogs $$a ; \
+               $(TAR) -c -h -v -f - \
+                       -X $$a/.exclude-file $$a | \
                gzip -9 > e2fsprogs-@E2FSPROGS_VERSION@.tar.gz)
        rm -f $(srcdir)/.exclude-file