[SCM] LibreOffice packaging repository branch, debian-experimental-3.4.0, updated. 0e556d1952478f1380fb0965b5a8f68efc5ea596
The following commit has been merged in the debian-experimental-3.4.0 branch:
commit 0e556d1952478f1380fb0965b5a8f68efc5ea596
Author: Rene Engelhard <rene@debian.org>
Date: Tue May 31 01:10:43 2011 +0200
make build should imply make unpack; use make build instead of the non-working make (all)
diff --git a/rules b/rules
index 7e0f7bc..003c4c4 100755
--- a/rules
+++ b/rules
@@ -1654,11 +1654,10 @@ ifeq "$(BUILD_KDE)" "n"
fi
endif
- cd $(OOO_BUILD_TREE) ; PATH=$(BUILD_PATH) LD_LIBRARY_PATH=$(BUILD_LD_LIBRARY_PATH) DEFAULT_TO_ENGLISH_FOR_PACKING=1 ARCH_FLAGS=$(ARCH_FLAGS) TMP=`mktemp -q -d` $(MAKE) unpack
ifeq ($(ON_BUILDD),y)
- cd $(OOO_BUILD_TREE) ; PATH=$(BUILD_PATH) LD_LIBRARY_PATH=$(BUILD_LD_LIBRARY_PATH) DEFAULT_TO_ENGLISH_FOR_PACKING=1 ARCH_FLAGS=$(ARCH_FLAGS) TMP=`mktemp -q -d` $(MAKE)
+ cd $(OOO_BUILD_TREE) ; PATH=$(BUILD_PATH) LD_LIBRARY_PATH=$(BUILD_LD_LIBRARY_PATH) DEFAULT_TO_ENGLISH_FOR_PACKING=1 ARCH_FLAGS=$(ARCH_FLAGS) TMP=`mktemp -q -d` $(MAKE) build
else
- cd $(OOO_BUILD_TREE) ; PATH=$(BUILD_PATH) LD_LIBRARY_PATH=$(BUILD_LD_LIBRARY_PATH) DEFAULT_TO_ENGLISH_FOR_PACKING=1 VERBOSE=true ARCH_FLAGS=$(ARCH_FLAGS) TMP=`mktemp -q -d` $(MAKE)
+ cd $(OOO_BUILD_TREE) ; PATH=$(BUILD_PATH) LD_LIBRARY_PATH=$(BUILD_LD_LIBRARY_PATH) DEFAULT_TO_ENGLISH_FOR_PACKING=1 VERBOSE=true ARCH_FLAGS=$(ARCH_FLAGS) TMP=`mktemp -q -d` $(MAKE) build
endif
# apparently setting this here globally doesn't work, so hack around.
--
LibreOffice packaging repository
Reply to: