diff options
author | Thorsten Behrens <tbehrens@novell.com> | 2009-06-11 11:03:29 +0200 |
---|---|---|
committer | Thorsten Behrens <tbehrens@novell.com> | 2009-06-11 11:56:40 +0200 |
commit | bc685bd2135e90c85893bad5586cc16a237e38df (patch) | |
tree | 3dd6e5bc752dc8410ddc9b8e362ea3290457c46d /Makefile.shared | |
parent | 21e043b0abb0d229ba476c1cda70a4910248a226 (diff) |
dev-install target now with tweaked config and local config dir
Now, dev-install no longer uses the user's config from ~/.ooo3,
but an installation-local one. Additionally, a tweakconfig extension
is installed, that changes some config items to hacker-friendly
values (i.e. enabling pretty-printing of odf)
* Makefile.am:
* Makefile.shared:
* configure.in:
* extensions/Makefile.am:
* extensions/tweakconfig/Common.xcu:
* extensions/tweakconfig/Linguistic.xcu:
* extensions/tweakconfig/Makefile.am:
* extensions/tweakconfig/Paths.xcu:
* extensions/tweakconfig/Recovery.xcu:
* extensions/tweakconfig/description.xml:
* extensions/tweakconfig/manifest.xml:
Diffstat (limited to 'Makefile.shared')
-rw-r--r-- | Makefile.shared | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Makefile.shared b/Makefile.shared index afcf8e746..e412bd088 100644 --- a/Makefile.shared +++ b/Makefile.shared @@ -109,6 +109,8 @@ endif 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 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 |