From 4066d3190305613ed042cad3978b5d737420cd2c Mon Sep 17 00:00:00 2001
From: Michael Stahl <mstahl@redhat.com>
Date: Wed, 30 Oct 2013 16:48:58 +0100
Subject: [PATCH] setup_native: Package_misc to INSTDIR

Change-Id: Ieaceb78438712bf4bde05daf3a7fd0a82ad9baed
---
 setup_native/Module_setup_native.mk | 7 ++++++-
 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: