summaryrefslogtreecommitdiff
path: root/instsetoo_native/Package_setup.mk
diff options
context:
space:
mode:
authorMatúš Kukan <matus.kukan@gmail.com>2013-09-17 13:56:12 +0200
committerMatúš Kukan <matus.kukan@gmail.com>2013-09-17 19:37:42 +0200
commitf5b840a3ee14a2086647596246d3491a58bf33bb (patch)
tree84b5b61340679be7d7929583090b3463651cdeee /instsetoo_native/Package_setup.mk
parentbb15aeb0bbd063e557f21c4edde03949c66173fd (diff)
goodbye linkoo.. you have served well
This commit: - removes linkoo and --disable-linkoo option - removes 'dev-update' make target - creates --disable-ooenv option - removes LD_LIBRARY_PATH and PATH settings in ooenv Change-Id: I9530558531e9cb58b8282754ec8a6c655f190480
Diffstat (limited to 'instsetoo_native/Package_setup.mk')
-rw-r--r--instsetoo_native/Package_setup.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/instsetoo_native/Package_setup.mk b/instsetoo_native/Package_setup.mk
index 2cd15fcfb8d0..caada4f77655 100644
--- a/instsetoo_native/Package_setup.mk
+++ b/instsetoo_native/Package_setup.mk
@@ -14,7 +14,7 @@ $(eval $(call gb_Package_set_outdir,instsetoo_native_setup,$(gb_INSTROOT)))
$(eval $(call gb_Package_add_files,instsetoo_native_setup,$(gb_PROGRAMDIRNAME),\
$(call gb_Helper_get_rcfile,bootstrap) \
$(call gb_Helper_get_rcfile,fundamental) \
- ooenv \
+ $(if $(ENABLE_OOENV),ooenv) \
$(if $(filter TRUE,$(DISABLE_PYTHON)),,$(call gb_Helper_get_rcfile,pythonloader.uno)) \
$(call gb_Helper_get_rcfile,uno) \
$(call gb_Helper_get_rcfile,version) \