[SCM] LibreOffice packaging repository branch, debian-experimental-3.5, updated. libreoffice_3.5.0_beta2-2-41-gf5608ff
The following commit has been merged in the debian-experimental-3.5 branch:
commit f5608ffe43a8933ff5331ec7aaff3f7b428079bb
Author: Rene Engelhard <rene@debian.org>
Date: Sun Jan 15 23:06:05 2012 +0100
run configure, not autogen if existing. add autoreconf.diff
diff --git a/patches/series b/patches/series
index 454f45c..ad83192 100644
--- a/patches/series
+++ b/patches/series
@@ -28,3 +28,4 @@ revert-468fe685e3c58c84bce6d9a48b931dcc21682679.diff
propagate-gb_FULLDEPS.diff
ppc-fix-soffice.sh.diff
jdbc-driver-threading.diff
+autoreconf.diff
diff --git a/rules b/rules
index c057b28..6ef69d5 100755
--- a/rules
+++ b/rules
@@ -1524,6 +1524,7 @@ config.status:
for FILE in debian/scripts/move-if-change \
debian/scripts/cleandupes \
debian/scripts/get_libebook_dep.sh \
+ configure \
autogen.sh; \
do \
chmod 755 $$FILE ;\
@@ -1557,7 +1558,11 @@ endif
# Make sure we have /proc mounted - otherwise idlc will fail later.
test -r /proc/version
- PATH=$(BUILD_PATH) LD_LIBRARY_PATH=$(BUILD_LD_LIBRARY_PATH) ./autogen.sh $(CONFIGURE_FLAGS)
+ if [ -x ./configure ]; then \
+ PATH=$(BUILD_PATH) LD_LIBRARY_PATH=$(BUILD_LD_LIBRARY_PATH) ./configure $(CONFIGURE_FLAGS); \
+ else \
+ PATH=$(BUILD_PATH) LD_LIBRARY_PATH=$(BUILD_LD_LIBRARY_PATH) ./autogen.sh $(CONFIGURE_FLAGS); \
+ fi
touch $@
--
LibreOffice packaging repository
Reply to: