The following commit has been merged in the debian-experimental-3.7 branch:
commit b199550ce8782e410efbccc7267e0612a9b55a03
Author: Rene Engelhard <[email protected]>
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 4ceb61c..f102e8c 100755
--- a/rules
+++ b/rules
@@ -1595,9 +1595,15 @@ ifeq "$(BUILD_PYUNO)" "y"
rm -rf $(SOURCE_TREE)/py3uno
cp -ra $(SOURCE_TREE)/pyuno $(SOURCE_TREE)/py3uno
$(MAKE) py3uno.clean
+ ifeq "$(PYTHON3_VERSION)" "default"
cd py3uno && \
patch -p1 < $(CURDIR)/debian/patches/pyuno-copy-for-python3.diff
make cmd cmd='cd py3uno; export PYTHON=$(PYTHON3); export
PYTHON_CFLAGS="$(shell pkg-config --cflags python$(PY3MAJOR))"; export
PYTHON_LIBS="$(shell pkg-config --libs python$(PY3MAJOR))"; $(MAKE)'
+ else
+ cd py3uno && \
+ patch -p1 < $(CURDIR)/debian/patches/pyuno-copy-for-python3.diff
+ make cmd cmd='cd py3uno; export PYTHON=$(PYTHON3); export
PYTHON_CFLAGS="$(shell pkg-config --cflags python-$(PY3MAJOR).$(PY3MINOR))";
export PYTHON_LIBS="$(shell pkg-config --libs python-$(PY3MAJOR).$(PY3MINOR))";
$(MAKE)'
+ endif
endif
endif
--
LibreOffice packaging repository
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
Archive: http://lists.debian.org/[email protected]
