[latexrefman-commits] r524 - in /trunk: ChangeLog Makefile.1

[vincent.b.1 at domain.hid]

Author: vincentb1
Date: Fri Apr  8 00:22:11 2016
New Revision: 524

URL: http://svn.gna.org/viewcvs/latexrefman?rev=524&view=rev
Log:
* Makefile.1 (dist-xx, dist): Fix pior check that there aren't any
uncommited changes before making the zip.

Modified:
    trunk/ChangeLog
    trunk/Makefile.1

Modified: trunk/ChangeLog
URL: http://svn.gna.org/viewcvs/latexrefman/trunk/ChangeLog?rev=524&r1=523&r2=524&view=diff
==============================================================================
--- trunk/ChangeLog	(original)
+++ trunk/ChangeLog	Fri Apr  8 00:22:11 2016
@@ -1,3 +1,8 @@
+2016-04-08  Vincent Belaïche  <vincentb1 at domain.hid>
+
+	* Makefile.1 (dist-xx, dist): Fix pior check that there aren't any
+	uncommited changes before making the zip.
+
 2016-04-07  Vincent Belaïche  <vincentb1 at domain.hid>
 
 	* latex2e-fr.{dbk,html,info,txt,xml,pdf}: Update French manuals

Modified: trunk/Makefile.1
URL: http://svn.gna.org/viewcvs/latexrefman/trunk/Makefile.1?rev=524&r1=523&r2=524&view=diff
==============================================================================
--- trunk/Makefile.1	(original)
+++ trunk/Makefile.1	Fri Apr  8 00:22:11 2016
@@ -208,14 +208,17 @@
 define lang_template
 .PHONY: dist-$(1)
 dist-$(1): updated-$(1)
-	@if svn status $(call dist_output,$(1)) $(txt_files) \
-		&& test -z "$(DIST_FORCE)"; \
+	@uncommited=`svn status $(call dist_output,$(1)) $(txt_files)`; \
+	echo -n "$$$$uncommited"; \
+	if [ -n "$$$$uncommited" -a -z "$(DIST_FORCE)" ]; \
 	then \
+		echo ""; \
 		echo "There are uncommited changes."; \
 		echo "Commit them before making the distribution zip..."; \
 		echo "or make again with DIST_FORCE=1."; \
 		exit 2; \
 	fi
+	@echo ""
 	rm -fr $(dist-$(1))
 	$(call make_dist_dir,$(dist-$(1)),$(1),..,$(txt_files))
 	-zip -qr $(dist-$(1)).zip $(dist-$(1)) 
@@ -230,14 +233,17 @@
 #
 .PHONY: dist
 dist: all
-	@if svn status $(foreach lang,$(languages),$(call dist_output,$(lang))) $(txt_files) \
-		&& test -z "$(DIST_FORCE)"; \
+	@uncommited=`svn status $(foreach lang,$(languages),$(call dist_output,$(lang))) $(txt_files)`; \
+	echo -n "$$uncommited"; \
+	if [ -n "$$uncommited" -a -z "$(DIST_FORCE)" ]; \
 	then \
+		echo ""; \
 		echo "There are uncommited changes."; \
 		echo "Commit them before making the distribution zip..."; \
 		echo "or make again with DIST_FORCE=1."; \
 		exit 2; \
 	fi
+	@echo ""
 	rm -fr $(dist)
 	$(call make_dist_dir,$(dist),$(default_language),..,$(txt_files))
 	$(foreach lang,$(other_languages), \