[SCM] LibreOffice packaging repository branch, debian-experimental-3.6, updated. libreoffice_3.6.3_rc2-1-28-gb02bff7
The following commit has been merged in the debian-experimental-3.6 branch:
commit a91cddd077f9511b2fe87e21dc7a6dda6ad3f557
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 93c09c7..77c7b49 100755
--- a/rules
+++ b/rules
@@ -1582,10 +1582,17 @@ ifeq "$(BUILD_PYUNO)" "y"
# then...
rm -rf $(SOURCE_TREE)/pyuno-py3
cp -ra $(SOURCE_TREE)/pyuno $(SOURCE_TREE)/pyuno-py3
+ ifeq "$(PYTHON3_VERSION)" "default"
. $(SOURCE_TREE)/config_host.mk.source; \
cd pyuno-py3 && \
rm -rf $$OUTPATH$$PROEXT; \
PYTHON=$(PYTHON3) PYTHON_CFLAGS="$(shell pkg-config --cflags python$(PY3MAJOR))" PYTHON_LIBS="$(shell pkg-config --libs python$(PY3MAJOR))" ../solenv/bin/build.pl
+ else
+ . $(SOURCE_TREE)/config_host.mk.source; \
+ cd pyuno-py3 && \
+ rm -rf $$OUTPATH$$PROEXT; \
+ PYTHON=$(PYTHON3) PYTHON_CFLAGS="$(shell pkg-config --cflags python-$(PY3MAJOR).$(PY3MINOR))" PYTHON_LIBS="$(shell pkg-config --libs python-$(PY3MAJOR).$(PY3MINOR))" ../solenv/bin/build.pl
+ endif
endif
endif
--
LibreOffice packaging repository
Reply to: