[Libreoffice-commits] .: Makefile.shared

Thorsten Behrens thorsten at kemper.freedesktop.org
Fri Oct 8 13:14:45 PDT 2010

 Makefile.shared |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit c07054af0eaf0f0508da9f4fb438f185670b4090
Author: Thorsten Behrens <tbehrens at novell.com>
Date:   Fri Oct 8 22:13:01 2010 +0200

    Make tweakconfig install conditional to oxt existence
    As autotools suck so much, and apparently do not support custom
    recursive targets, a plain "make dev-install" does not build the
    tweakconfig extension. So don't break if it's not there.

diff --git a/Makefile.shared b/Makefile.shared
index b4efaa6..9aee187 100644
--- a/Makefile.shared
+++ b/Makefile.shared
@@ -133,7 +133,9 @@ dev-install: $(BUILDDIR)/install/program/ooenv
 $(BUILDDIR)/install/program/ooenv: $(STAMP_DIR)/build
 	cd bin; ./ooinstall -l $(BUILDDIR)/install
 	sed -i 's/UserInstallation=$$SYSUSERCONFIG\/.ooo3/UserInstallation=$$ORIGIN\/..\/.ooo3/g' $(BUILDDIR)/install/program/bootstraprc
-	$(BUILDDIR)/install/program/unopkg add -v --shared $(BUILDDIR)/bin/tweakconfig.oxt
+	if test -f $(BUILDDIR)/bin/tweakconfig.oxt$(OOBUILDDIR)/applied_patches ; then \
+	   $(BUILDDIR)/install/program/unopkg add -v --shared $(BUILDDIR)/bin/tweakconfig.oxt \
+	fi
 smoketest: $(BUILDDIR)/install/program/ooenv
 	echo framework/required/f_topten.bas | $(OOBUILDDIR)/testautomation/tools/run_tests/run_tests.sh -p $(BUILDDIR)/install/basis*/program/testtool.bin

More information about the Libreoffice-commits mailing list