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

[SCM] LibreOffice packaging repository branch, debian-experimental-4.2, updated. libreoffice_4.1.0-1-39-g40338ee



The following commit has been merged in the debian-experimental-4.2 branch:
commit 46714347bd7b7a8557d8d4962530f6bb6c91a0e6
Author: Rene Engelhard <rene@debian.org>
Date:   Fri Jul 26 20:05:35 2013 +0200

    move FIREBIRD_CFLAGS/_LIBS for build-indep for consistency

diff --git a/rules b/rules
index 1796b1e..f065e89 100755
--- a/rules
+++ b/rules
@@ -1807,8 +1807,8 @@ $(STAMP_DIR)/build-indep:
 
 	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))" \
-	FIREBIRD_CFLAGS=$(FIREBIRD_CFLAGS) FIREBIRD_LIBS=$(FIREBIRD_LIBS) \
 	MARIADBCONFIG=$(MARIADBCONFIG) \
+	FIREBIRD_CFLAGS=$(FIREBIRD_CFLAGS) FIREBIRD_LIBS=$(FIREBIRD_LIBS) \
 	./autogen.sh $(CONFIGURE_FLAGS) --with-help $(CONFIGURE_FLAGS_LANG)
 
 ifneq "$(WHEEZY_BACKPORT)" "y"

-- 
LibreOffice packaging repository


Reply to: