summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBertrand Garrigues <bertrand.garrigues@laposte.net>2014-10-11 23:58:27 +0200
committerBertrand Garrigues <bertrand.garrigues@laposte.net>2014-10-11 23:58:27 +0200
commit174709c2c74ce4f664eaf5a8d33670e38157472d (patch)
treee5c66d730d6de94a2866fcbf9f7bf7ea5aabee10
parent62d772ec3023485a7291b31c8c80126de8dd994a (diff)
downloadgroff-git-174709c2c74ce4f664eaf5a8d33670e38157472d.tar.gz
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'.
-rw-r--r--ChangeLog13
-rw-r--r--Makefile.in5
2 files changed, 17 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 1f80b4ed6..3f37faf19 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2014-10-11 Bertrand Garrigues <bertrand.garrigues@laposte.net>
+
+ 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 <groff-bernd.warken-72@web.de>
* src/roff/grog/*.pl: Remove call from `IPC', use normal system
diff --git a/Makefile.in b/Makefile.in
index b1e51b66c..139d7cb05 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