[groff] 01/02: * Makefile.in (dist): Improve.

[Werner LEMBERG]

wl pushed a commit to branch master
in repository groff.

commit de2cdbce378704ba6f520d0f54ba259fb0dc9a69
Author: Ingo Schwarze <address@hidden>
Date:   Tue Mar 11 05:48:35 2014 +0100

    * Makefile.in (dist): Improve.
    
     - Bugfix: Do not error out if one of the DISTDIRS
       contains a subdirectory.
     - Make debugging easier by splitting the huge "cd tmp; ...; ..."
       command sequence into several independent shell commands,
       such that one can see which command actually fails.
---
 ChangeLog   |   10 ++++++++++
 Makefile.in |   23 +++++++++++------------
 2 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index e55d7d5..b718254 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2014-03-11  Ingo Schwarze  <address@hidden> (tiny change)
+
+       * Makefile.in (dist): Improve.
+
+        - Bugfix: Do not error out if one of the DISTDIRS
+          contains a subdirectory.
+        - Make debugging easier by splitting the huge "cd tmp; ...; ..."
+          command sequence into several independent shell commands,
+          such that one can see which command actually fails.
+
 2014-03-06  Deri James  <address@hidden>
 
        Missing RE escape in grep.
diff --git a/Makefile.in b/Makefile.in
index 763516a..a26b3b1 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -836,25 +836,24 @@ dist:
        for d in $(DISTDIRS); do \
          $(mkinstalldirs) tmp/$$d; \
        done
-       cd tmp; \
-       cp ../Makefile .; \
-       cp $(top_srcdir)/* . 2>/dev/null || true; \
-       for d in $(DISTDIRS); do \
-         (cd $$d; \
+       cp Makefile tmp
+       -cp * tmp 2>/dev/null
+       -for d in $(DISTDIRS); do \
+         (cd tmp/$$d; \
           cp $(top_srcdir)/$$d/* . 2>/dev/null;); \
-       done; \
-       $(MAKE) srcdir=. VPATH=. distfiles; \
-       $(MAKE) srcdir=. VPATH=. extraclean; \
+       done
+       cd tmp; $(MAKE) srcdir=. VPATH=. distfiles
+       cd tmp; $(MAKE) srcdir=. VPATH=. extraclean
        for d in $(EXTRADIRS); do \
-         (cd $$d; \
+         (cd tmp/$$d; \
           if test -f Makefile; then \
             $(MAKE) extraclean; \
           else \
             $(MAKE) -f $(top_builddir)/$$d/Makefile extraclean; \
           fi); \
-       done; \
-       rm -f Makefile; \
-       cp $(top_srcdir)/Makefile.init Makefile
+       done
+       rm -f tmp/Makefile
+       cp Makefile.init tmp/Makefile
        mv tmp groff-$(version)$(revision)
        tar cfh - groff-$(version)$(revision) | \
          gzip -c >groff-$(version)$(revision).tar.gz