[SCM] LibreOffice packaging repository branch, debian-experimental-3.5, updated. libreoffice_3.5.4_dfsg-3-39-g7b22bb9
The following commit has been merged in the debian-experimental-3.5 branch:
commit 026f937016d4a5cd4edf84ddfdd471283c584c76
Author: Rene Engelhard <rene@debian.org>
Date: Thu Nov 15 21:04:08 2012 +0100
actually use pythonX.Y.pc when PYTHON3_VERSION isn't default
diff --git a/rules b/rules
index 1053293..2cd1c11 100755
--- a/rules
+++ b/rules
@@ -1598,11 +1598,19 @@ ifeq "$(BUILD_PYUNO)" "y"
# then...
rm -rf $(SOURCE_TREE)/pyuno-py3
cp -ra $(SOURCE_TREE)/pyuno $(SOURCE_TREE)/pyuno-py3
+ ifeq "$(PYTHON3_VERSION)" "default"
cd $(SOURCE_TREE)/pyuno-py3; \
rm -rf $(shell . $(SOURCE_TREE)/Env.Host.sh; echo $$OUTPATH$$PROEXT); \
. $(CURDIR)/$(SOURCE_TREE)/Env.Host.sh; \
PATH=$(BUILD_PATH) PYTHON=$(PYTHON3) PYTHON_CFLAGS=$(shell pkg-config --cflags python$(PY3MAJOR)) PYTHON_LIBS=$(shell pkg-config --libs python$(PY3MAJOR)) \
../solenv/bin/build.pl # NO DELIVER!
+ else
+ cd $(SOURCE_TREE)/pyuno-py3; \
+ rm -rf $(shell . $(SOURCE_TREE)/Env.Host.sh; echo $$OUTPATH$$PROEXT); \
+ . $(CURDIR)/$(SOURCE_TREE)/Env.Host.sh; \
+ PATH=$(BUILD_PATH) PYTHON=$(PYTHON3) PYTHON_CFLAGS=$(shell pkg-config --cflags python-$(PY3MAJOR).$(PY3MINOR)) PYTHON_LIBS=$(shell pkg-config --libs python-$(PY3MAJOR).$(PY3MINOR)) \
+ ../solenv/bin/build.pl # NO DELIVER!
+ endif
endif
endif
--
LibreOffice packaging repository
Reply to: