[oolite] 10/11: * Pass build flags to GNUstep on command line instead of ignored environment. * Use temporary loffice HOME for .doc, not only .odt.

[Nicolas Boulenguez]

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

nicobou-guest pushed a commit to branch master
in repository oolite.

commit a56800efcd7d26dbbe36b4108caf95cc430259fa
Author: Nicolas Boulenguez <nicolas.boulenguez at free.fr>
Date:   Mon Aug 31 03:32:00 2015 +0200

    * Pass build flags to GNUstep on command line instead of ignored environment.
    * Use temporary loffice HOME for .doc, not only .odt.
---
 debian/rules | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/debian/rules b/debian/rules
index b6103d6..4d00509 100755
--- a/debian/rules
+++ b/debian/rules
@@ -53,9 +53,9 @@ GSMAKE += messages=yes
 # debugging and stripping of the binary.
 GSMAKE += STRIP=/bin/true
 
-DPKG_EXPORT_BUILDFLAGS := 1
 DEB_LDFLAGS_MAINT_PREPEND := -Wl,-z,defs -Wl,--as-needed
 include /usr/share/dpkg/buildflags.mk
+GSMAKE += $(foreach f,CFLAGS CPPFLAGS LDFLAGS OBJCFLAGS,"$(f)=$($(f))")
 
 # Ignore GNUSTEP optimization setting, noopt is handled by CFLAGS.
 GSMAKE += OPTFLAG=""
@@ -119,9 +119,9 @@ PDF_FROM_ODT := \
   Doc/OoliteRS.pdf
 
 # Attempt to circumvent #730893.
-TMP_LOFFICE_HOME := debian/tmp_loffice_config
-$(PDF_FROM_ODT): export XDG_CONFIG_HOME := $(TMP_LOFFICE_HOME)
-$(PDF_FROM_ODT): $(TMP_LOFFICE_HOME)
+TMP_LOFFICE_HOME := $(CURDIR)/debian/tmp_loffice_config
+$(PDF_FROM_DOC) $(PDF_FROM_ODT): export XDG_CONFIG_HOME := $(TMP_LOFFICE_HOME)
+$(PDF_FROM_DOC) $(PDF_FROM_ODT): $(TMP_LOFFICE_HOME)
 $(TMP_LOFFICE_HOME):
 	mkdir $@
 override_dh_auto_clean::

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