groff-commit
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[groff] 01/01: Fix an issue on `make dist'.


From: Bertrand Garrigues
Subject: [groff] 01/01: Fix an issue on `make dist'.
Date: Sat, 11 Oct 2014 22:06:50 +0000

bgarrigues pushed a commit to branch master
in repository groff.

commit 174709c2c74ce4f664eaf5a8d33670e38157472d
Author: Bertrand Garrigues <address@hidden>
Date:   Sat Oct 11 23:58:27 2014 +0200

    Fix an issue on `make dist'.
    
    In order to make the tarball, `make dist' copies src/libs/gnulib
    directories into the `tmp' directory without the `.deps'
    directories, causing the failure of `make distclean' in
    tmp/src/libs/gnulib.  Forcing a call to `config.status' recreates
    the `.deps' directories.
    
    * Makefile.in: in `dist' target, for gnulib, call `config.status'
    before `make distclean'.
---
 ChangeLog   |   13 +++++++++++++
 Makefile.in |    5 ++++-
 2 files changed, 17 insertions(+), 1 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 1f80b4e..3f37faf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2014-10-11  Bertrand Garrigues  <address@hidden>
+
+       Fix an issue on `make dist'.
+
+       In order to make the tarball, `make dist' copies src/libs/gnulib
+       directories into the `tmp' directory without the `.deps'
+       directories, causing the failure of `make distclean' in
+       tmp/src/libs/gnulib.  Forcing a call to `config.status' recreates
+       the `.deps' directories.
+
+       * Makefile.in: in `dist' target, for gnulib, call `config.status'
+       before `make distclean'.
+
 2014-10-11  Bernd Warken  <address@hidden>
 
        * src/roff/grog/*.pl: Remove call from `IPC', use normal system
diff --git a/Makefile.in b/Makefile.in
index b1e51b6..139d7cb 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -914,10 +914,13 @@ dist:
        done
        for d in $(GNULIBDIRS); do \
          (cd tmp/$$d; \
+          if test -f config.status; then \
+            ./config.status; \
+          fi; \
           if test -f Makefile; then \
             $(MAKE) distclean; \
           else \
-            $(MAKE) -f $(top_builddir)/$$d/Makefile distcleanclean; \
+            $(MAKE) -f $(top_builddir)/$$d/Makefile distclean; \
           fi; \
           rm -rf autom4te.cache); \
        done



reply via email to

[Prev in Thread] Current Thread [Next in Thread]