diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-10-30 16:48:58 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-10-31 10:42:23 +0100 |
| commit | 4066d3190305613ed042cad3978b5d737420cd2c (patch) | |
| tree | 208e0b473322e4b2781e25d7ed5ae21fbb0b4357 /setup_native | |
| parent | 862b9390b4fbfae37d01e06c954dd72eb9a008e1 (diff) | |
setup_native: Package_misc to INSTDIR
Change-Id: Ieaceb78438712bf4bde05daf3a7fd0a82ad9baed
Diffstat (limited to 'setup_native')
| -rw-r--r-- | setup_native/Module_setup_native.mk | 7 | ||||
| -rw-r--r-- | setup_native/Package_misc.mk | 6 |
2 files changed, 8 insertions, 5 deletions
diff --git a/setup_native/Module_setup_native.mk b/setup_native/Module_setup_native.mk index 3daff3f6e042..2e0c6ec5312a 100644 --- a/setup_native/Module_setup_native.mk +++ b/setup_native/Module_setup_native.mk @@ -13,7 +13,6 @@ $(eval $(call gb_Module_add_targets,setup_native,\ $(if $(filter LINUX SOLARIS,$(OS)),Library_getuid) \ CustomTarget_spell \ Package_packinfo \ - Package_misc \ )) ifeq ($(OS),MACOSX) @@ -23,6 +22,12 @@ $(eval $(call gb_Module_add_targets,setup_native,\ )) 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 \ diff --git a/setup_native/Package_misc.mk b/setup_native/Package_misc.mk index e03e5ca582d5..a90a3994529e 100644 --- a/setup_native/Package_misc.mk +++ b/setup_native/Package_misc.mk @@ -7,10 +7,8 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_Package_Package,setup_native/misc,$(SRCDIR)/setup_native/source)) +$(eval $(call gb_Package_Package,setup_native_misc,$(SRCDIR)/setup_native/source)) -$(eval $(call gb_Package_set_outdir,setup_native/misc,$(OUTDIR))) - -$(eval $(call gb_Package_add_file,setup_native/misc,bin/desktophelper.txt,win32/desktophelper.txt)) +$(eval $(call gb_Package_add_file,setup_native_misc,$(LIBO_BIN_FOLDER)/desktophelper.txt,win32/desktophelper.txt)) # vim: set noet sw=4 ts=4: |