[libreoffice] 02/07: change locale path to debian/locales; move rm -rf to clean-debdir

[Rene Engelhard]

This is an automated email from the git hooks/post-receive script.

rene pushed a commit to branch debian-experimental-5.4
in repository libreoffice.

commit 1ca623331be2c93b9d6d1f1d26bc68a983628c12
Author: Rene Engelhard <rene at rene-engelhard.de>
Date:   Mon Jun 12 11:20:21 2017 +0200

    change locale path to debian/locales; move rm -rf to clean-debdir
---
 rules              | 7 ++++---
 scripts/locale-gen | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/rules b/rules
index 61fbd47..96b2d2f 100755
--- a/rules
+++ b/rules
@@ -1614,6 +1614,8 @@ clean-debdir:
 	rm -f debian/*.postinst debian/*.postrm debian/*.preinst debian/*.prerm debian/*.triggers
 	rm -f debian/pom*.xml
 
+	rm -rf $(CURDIR)/debian/locales
+
 	mh_clean
 	dh_clean
 
@@ -2031,8 +2033,7 @@ endif
 
 	# generate the needed en_US.UTF-8. Upstream doesn't want to support
 	# anything else (even though C.UTF-8 works)
-	rm -rf $(CURDIR)/locales
-	mkdir $(CURDIR)/locales
+	mkdir -p $(CURDIR)/debian/locales
 	USE_CPUS=$(NUM_CPUS) debian/scripts/locale-gen
 
 	# build the tests first
@@ -2059,7 +2060,7 @@ endif
 		export SAL_USE_VCLPLUGIN="svp"; \
 		export LANG=en_US.UTF-8; \
 		export LC_ALL=en_US.UTF-8; \
-		export LOCPATH=$(CURDIR)/locales; \
+		export LOCPATH=$(CURDIR)/debian/locales; \
 		if [ -x /usr/bin/gdb ]; then ulimit -c unlimited; fi && \
 		$(MAKE) -k uicheck || PARALLELISM=1 $(MAKE) uicheck && \
 	rm -rf $$t
diff --git a/scripts/locale-gen b/scripts/locale-gen
index 4c05d09..c7334fd 100755
--- a/scripts/locale-gen
+++ b/scripts/locale-gen
@@ -3,7 +3,7 @@
 # generate locales that uicheck depend on
 # "stolen" from gcc
 
-LOCPATH=`pwd`/locales
+LOCPATH=`pwd`/debian/locales
 export LOCPATH
 
 [ -d $LOCPATH ] || mkdir -p $LOCPATH

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git