desktop: need only one Package_scripts

Change-Id: Ia47d1cc8c2d754f74e281eac82c76fbaf12d8541

3 files changed, 13 insertions, 45 deletions

diff --git a/desktop/Module_desktop.mk b/desktop/Module_desktop.mk
index e13e8fcd8682..2c709924453f 100644
--- a/desktop/Module_desktop.mk
+++ b/desktop/Module_desktop.mk
@@ -40,7 +40,6 @@ $(eval $(call gb_Module_add_targets,desktop,\
     Library_migrationoo3 \
     Library_unopkgapp \
     Package_scripts \
-    Package_scripts_install \
     Pagein_calc \
     Pagein_common \
     Pagein_draw \
diff --git a/desktop/Package_scripts.mk b/desktop/Package_scripts.mk
index 5171cb8d42c2..046ba69dc5cd 100644
--- a/desktop/Package_scripts.mk
+++ b/desktop/Package_scripts.mk
@@ -7,25 +7,27 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_Package_Package,desktop_scripts,$(SRCDIR)/desktop/scripts))
+$(eval $(call gb_Package_Package,desktop_scripts_install,$(SRCDIR)/desktop/scripts))
+
+$(eval $(call gb_Package_set_outdir,desktop_scripts_install,$(INSTROOT)))
 
 ifeq (,$(filter MACOSX WNT,$(OS)))
 
-$(eval $(call gb_Package_add_file,desktop_scripts,bin/gdbtrace,gdbtrace))
-$(eval $(call gb_Package_add_file,desktop_scripts,bin/sbase,sbase.sh))
-$(eval $(call gb_Package_add_file,desktop_scripts,bin/scalc,scalc.sh))
-$(eval $(call gb_Package_add_file,desktop_scripts,bin/sdraw,sdraw.sh))
-$(eval $(call gb_Package_add_file,desktop_scripts,bin/simpress,simpress.sh))
-$(eval $(call gb_Package_add_file,desktop_scripts,bin/smath,smath.sh))
-$(eval $(call gb_Package_add_file,desktop_scripts,bin/swriter,swriter.sh))
+$(eval $(call gb_Package_add_file,desktop_scripts_install,$(LIBO_BIN_FOLDER)/gdbtrace,gdbtrace))
+$(eval $(call gb_Package_add_file,desktop_scripts_install,$(LIBO_BIN_FOLDER)/sbase,sbase.sh))
+$(eval $(call gb_Package_add_file,desktop_scripts_install,$(LIBO_BIN_FOLDER)/scalc,scalc.sh))
+$(eval $(call gb_Package_add_file,desktop_scripts_install,$(LIBO_BIN_FOLDER)/sdraw,sdraw.sh))
+$(eval $(call gb_Package_add_file,desktop_scripts_install,$(LIBO_BIN_FOLDER)/simpress,simpress.sh))
+$(eval $(call gb_Package_add_file,desktop_scripts_install,$(LIBO_BIN_FOLDER)/smath,smath.sh))
+$(eval $(call gb_Package_add_file,desktop_scripts_install,$(LIBO_BIN_FOLDER)/swriter,swriter.sh))
 
 endif
 
 ifneq ($(OS),WNT)
 
-$(eval $(call gb_Package_add_file,desktop_scripts,bin/unoinfo,unoinfo.sh))
-$(eval $(call gb_Package_add_file,desktop_scripts,bin/unopkg,unopkg.sh))
+$(eval $(call gb_Package_add_file,desktop_scripts_install,$(LIBO_BIN_FOLDER)/unoinfo,unoinfo.sh))
+$(eval $(call gb_Package_add_file,desktop_scripts_install,$(LIBO_BIN_FOLDER)/unopkg,unopkg.sh))
 
 endif
 
-# vim: set ts=4 sw=4 et:
+# vim: set ts=4 sw=4 noet:
diff --git a/desktop/Package_scripts_install.mk b/desktop/Package_scripts_install.mk
deleted file mode 100644
index 046ba69dc5cd..000000000000
--- a/desktop/Package_scripts_install.mk
+++ /dev/null
@@ -1,33 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_Package_Package,desktop_scripts_install,$(SRCDIR)/desktop/scripts))
-
-$(eval $(call gb_Package_set_outdir,desktop_scripts_install,$(INSTROOT)))
-
-ifeq (,$(filter MACOSX WNT,$(OS)))
-
-$(eval $(call gb_Package_add_file,desktop_scripts_install,$(LIBO_BIN_FOLDER)/gdbtrace,gdbtrace))
-$(eval $(call gb_Package_add_file,desktop_scripts_install,$(LIBO_BIN_FOLDER)/sbase,sbase.sh))
-$(eval $(call gb_Package_add_file,desktop_scripts_install,$(LIBO_BIN_FOLDER)/scalc,scalc.sh))
-$(eval $(call gb_Package_add_file,desktop_scripts_install,$(LIBO_BIN_FOLDER)/sdraw,sdraw.sh))
-$(eval $(call gb_Package_add_file,desktop_scripts_install,$(LIBO_BIN_FOLDER)/simpress,simpress.sh))
-$(eval $(call gb_Package_add_file,desktop_scripts_install,$(LIBO_BIN_FOLDER)/smath,smath.sh))
-$(eval $(call gb_Package_add_file,desktop_scripts_install,$(LIBO_BIN_FOLDER)/swriter,swriter.sh))
-
-endif
-
-ifneq ($(OS),WNT)
-
-$(eval $(call gb_Package_add_file,desktop_scripts_install,$(LIBO_BIN_FOLDER)/unoinfo,unoinfo.sh))
-$(eval $(call gb_Package_add_file,desktop_scripts_install,$(LIBO_BIN_FOLDER)/unopkg,unopkg.sh))
-
-endif
-
-# vim: set ts=4 sw=4 noet: