install scripts from shell using filelists

The FILELIST install method is really tailored to large sets of closely
related files. It is not such a great idea to apply it just to move some
unrelated files, delivered from a single module, out of $(OUTDIR), like
here, because it requires splitting one Package to several to allow the
files to be placed to different installation modules in scp2. The extra
makefile increases the overhead needed to place a file into an
installation set. We really need a better way to handle this...

Change-Id: I2f271562d8773152e69d284b4fe8ae356dea0945

5 files changed, 56 insertions, 6 deletions

diff --git a/shell/Module_shell.mk b/shell/Module_shell.mk
index 5f936408a60a..ecd3772e31be 100644
--- a/shell/Module_shell.mk
+++ b/shell/Module_shell.mk
@@ -107,6 +107,9 @@ $(eval $(call gb_Module_add_targets,shell,\
 	Library_cmdmail \
 	Library_syssh \
 	Package_scripts \
+	Package_scripts_gnome \
+	Package_scripts_kde \
+	Package_senddoc \
 	StaticLibrary_xmlparser \
 ))
 
diff --git a/shell/Package_scripts.mk b/shell/Package_scripts.mk
index ac0402104224..a794e3e9bf5a 100644
--- a/shell/Package_scripts.mk
+++ b/shell/Package_scripts.mk
@@ -9,11 +9,10 @@
 
 $(eval $(call gb_Package_Package,shell_scripts,$(SRCDIR)/shell/source/unix/misc))
 
-$(eval $(call gb_Package_add_file,shell_scripts,bin/cde-open-url,cde-open-url.sh))
-$(eval $(call gb_Package_add_file,shell_scripts,bin/gnome-open-url,gnome-open-url.sh))
-$(eval $(call gb_Package_add_file,shell_scripts,bin/kde-open-url,kde-open-url.sh))
-$(eval $(call gb_Package_add_file,shell_scripts,bin/open-url,open-url.sh))
-$(eval $(call gb_Package_add_file,shell_scripts,bin/senddoc,senddoc.sh))
-$(eval $(call gb_Package_add_file,shell_scripts,bin/tde-open-url,tde-open-url.sh))
+$(eval $(call gb_Package_set_outdir,shell_scripts,$(INSTDIR)))
+
+$(eval $(call gb_Package_add_file,shell_scripts,program/cde-open-url,cde-open-url.sh))
+$(eval $(call gb_Package_add_file,shell_scripts,program/open-url,open-url.sh))
+$(eval $(call gb_Package_add_file,shell_scripts,program/tde-open-url,tde-open-url.sh))
 
 # vim: set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/shell/Package_scripts_gnome.mk b/shell/Package_scripts_gnome.mk
new file mode 100644
index 000000000000..a9737e5371c0
--- /dev/null
+++ b/shell/Package_scripts_gnome.mk
@@ -0,0 +1,16 @@
+# -*- 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,shell_scripts_gnome,$(SRCDIR)/shell/source/unix/misc))
+
+$(eval $(call gb_Package_set_outdir,shell_scripts_gnome,$(INSTDIR)))
+
+$(eval $(call gb_Package_add_file,shell_scripts_gnome,program/gnome-open-url,gnome-open-url.sh))
+
+# vim: set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/shell/Package_scripts_kde.mk b/shell/Package_scripts_kde.mk
new file mode 100644
index 000000000000..95f15986c99b
--- /dev/null
+++ b/shell/Package_scripts_kde.mk
@@ -0,0 +1,16 @@
+# -*- 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,shell_scripts_kde,$(SRCDIR)/shell/source/unix/misc))
+
+$(eval $(call gb_Package_set_outdir,shell_scripts_kde,$(INSTDIR)))
+
+$(eval $(call gb_Package_add_file,shell_scripts_kde,program/kde-open-url,kde-open-url.sh))
+
+# vim: set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/shell/Package_senddoc.mk b/shell/Package_senddoc.mk
new file mode 100644
index 000000000000..c94cb8a2c78a
--- /dev/null
+++ b/shell/Package_senddoc.mk
@@ -0,0 +1,16 @@
+# -*- 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,shell_senddoc,$(SRCDIR)/shell/source/unix/misc))
+
+$(eval $(call gb_Package_set_outdir,shell_senddoc,$(INSTDIR)))
+
+$(eval $(call gb_Package_add_file,shell_senddoc,program/senddoc,senddoc.sh))
+
+# vim: set shiftwidth=4 tabstop=4 noexpandtab: