[SCM] LibreOffice packaging repository branch, debian-experimental-4.1, updated. libreoffice_4.0.1_rc1-2-64-g4fea3e0
The following commit has been merged in the debian-experimental-4.1 branch:
commit e1ad40c09c4c1868007e2905292d6b40fe7245e4
Author: Rene Engelhard <rene@debian.org>
Date: Mon Mar 11 23:26:50 2013 +0100
run autogen.sh with the same variables in build-indep as in -arch (we might need them there, too)
diff --git a/rules b/rules
index 2a9779d..4f554ed 100755
--- a/rules
+++ b/rules
@@ -1675,7 +1675,10 @@ $(STAMP_DIR)/build-indep:
$(MAKE) reportbuilder.clean
rm -f config.status autogen.lastrun
- PATH=$(BUILD_PATH) LD_LIBRARY_PATH=$(BUILD_LD_LIBRARY_PATH) ./autogen.sh $(CONFIGURE_FLAGS) --with-help $(CONFIGURE_FLAGS_LANG)
+ PATH=$(BUILD_PATH) LD_LIBRARY_PATH=$(BUILD_LD_LIBRARY_PATH) \
+ PYTHON=$(PYTHON) PYTHON_CFLAGS="$(shell pkg-config --cflags python-$(PYMAJOR).$(PYMINOR))" PYTHON_LIBS="$(shell pkg-config --libs python-$(PYMAJOR).$(PYMINOR))" \
+ MARIADBCONFIG=$(MARIADBCONFIG) \
+ ./autogen.sh $(CONFIGURE_FLAGS) --with-help $(CONFIGURE_FLAGS_LANG)
PATH=$(BUILD_PATH) LD_LIBRARY_PATH=$(BUILD_LD_LIBRARY_PATH) DEFAULT_TO_ENGLISH_FOR_PACKING=1 ARCH_FLAGS=$(ARCH_FLAGS) TMP=`mktemp -q -d` $(MAKE) build-nocheck
--
LibreOffice packaging repository
Reply to: