[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[SCM] LibreOffice packaging repository branch, debian-experimental-3.7, updated. libreoffice_3.6.3_rc2-1-103-g9526387



The following commit has been merged in the debian-experimental-3.7 branch:
commit 9526387f1c04bc18397737c18275331774fb7244
Author: Rene Engelhard <rene@debian.org>
Date:   Wed Oct 31 23:19:17 2012 +0100

    make py3uno.clean; fix quoting of make cmd after new PYTHON_* \"s

diff --git a/rules b/rules
index 3bf397b..4dae38f 100755
--- a/rules
+++ b/rules
@@ -1618,9 +1618,10 @@ ifeq "$(BUILD_PYUNO)" "y"
   ifeq "$(ENABLE_PYTHON3)" "y"
 	rm -rf $(SOURCE_TREE)/py3uno
 	cp -ra $(SOURCE_TREE)/pyuno $(SOURCE_TREE)/py3uno
+	$(MAKE) py3uno.clean
 	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)"
+	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)'
   endif
 endif
 

-- 
LibreOffice packaging repository


Reply to: