[Groff] [patch] Improve the top-level "make dist" target.

[Ingo Schwarze]

Hi,

so here is my first Makefile.in patch, fixing one bug and doing
some cleanup.  The commit message ought to be sufficient to
understand why it's useful.

Now that i'm able to build myself distfiles, i'll go on with
the investigation regarding build order i originally intended...

Yours,
  Ingo


commit 51e15eb7182fa8454ea3f7d3f842f314fa2a37dc
Author: Ingo Schwarze <schwa...@openbsd.org>
Date:   Mon Mar 10 17:36:57 2014 +0100

    Improve the top-level "make dist" target.
    
    * Makefile.in:
     - 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.

diff --git a/ChangeLog b/ChangeLog
index e55d7d5..2a57001 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2014-03-10  Ingo Schwarze  <schwa...@openbsd.org>
+
+       * Makefile.in: Improve the top-level "make dist" target.
+
+        - 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  <d...@chuzzlewit.myzen.co.uk>
 
        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