diff options
| author | Matúš Kukan <matus.kukan@gmail.com> | 2016-12-01 22:19:04 +0100 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@gmail.com> | 2016-12-02 20:14:39 +0100 |
| commit | 67398a8d9746dbed743beb702a8cff2eac2bbf99 (patch) | |
| tree | 6b07d35e8b4c926775cd403940c4ea0a862ff15e /setup_native | |
| parent | a779b5f7f0dec55482172ca5dbe978dffbd46dac (diff) | |
tdf#90753: AutoInstall setup_native packages
Change-Id: Iecf059b974b996fceb57b04197c7dac9b7c8dd47
Diffstat (limited to 'setup_native')
| -rw-r--r-- | setup_native/Module_setup_native.mk | 24 | ||||
| -rw-r--r-- | setup_native/Package_scripts.mk | 4 |
2 files changed, 7 insertions, 21 deletions
diff --git a/setup_native/Module_setup_native.mk b/setup_native/Module_setup_native.mk index d0f935e26240..163bd4e24a88 100644 --- a/setup_native/Module_setup_native.mk +++ b/setup_native/Module_setup_native.mk @@ -11,25 +11,19 @@ $(eval $(call gb_Module_Module,setup_native)) $(eval $(call gb_Module_add_targets,setup_native,\ $(if $(filter LINUX SOLARIS,$(OS)),Library_getuid) \ + $(if $(filter MACOSX,$(OS)),CustomTarget_mac) \ CustomTarget_spell \ + $(if $(filter WNT,$(OS)),Package_misc) \ Package_packinfo \ + $(if $(filter LINUX SOLARIS,$(OS)), \ + CustomTarget_scripts \ + $(if $(ENABLE_ONLINE_UPDATE),Package_scripts) \ + ) \ )) -ifeq ($(OS),MACOSX) -$(eval $(call gb_Module_add_targets,setup_native,\ - CustomTarget_mac \ -)) -endif - -ifeq ($(OS),WNT) -$(eval $(call gb_Module_add_targets,setup_native,\ - Package_misc \ -)) -endif - ifeq ($(OS)$(COM),WNTMSC) $(eval $(call gb_Module_add_targets,setup_native,\ - Library_instooofiltmsi \ + Library_instooofiltmsi \ Library_qslnkmsi \ Library_reg4allmsdoc \ $(if $(DISABLE_ACTIVEX),,Library_regactivex) \ @@ -52,10 +46,6 @@ $(eval $(call gb_Module_add_targets,setup_native,\ )) endif -$(eval $(call gb_Module_add_targets,setup_native,\ - CustomTarget_scripts \ - Package_scripts \ -)) endif # vim: set noet sw=4 ts=4: diff --git a/setup_native/Package_scripts.mk b/setup_native/Package_scripts.mk index da754e11fee1..2f8fb7944d10 100644 --- a/setup_native/Package_scripts.mk +++ b/setup_native/Package_scripts.mk @@ -9,10 +9,6 @@ $(eval $(call gb_Package_Package,setup_native_scripts,$(SRCDIR)/setup_native/scripts)) -ifeq ($(ENABLE_ONLINE_UPDATE),TRUE) -ifneq ($(filter LINUX SOLARIS,$(OS)),) $(eval $(call gb_Package_add_file,setup_native_scripts,$(LIBO_BIN_FOLDER)/unpack_update,unpack_update.sh)) -endif -endif # vim: set noet sw=4 ts=4: |