diff options
author | Michael Stahl <mstahl@redhat.com> | 2013-10-24 15:38:44 +0200 |
---|---|---|
committer | Michael Stahl <mstahl@redhat.com> | 2013-10-24 17:56:06 +0200 |
commit | cacce520c64c3f1444f377bbe98f0f17bac4db40 (patch) | |
tree | c89fbff9e21bc318d9afd9d17b587158b86fa6c4 /desktop/Package_scripts.mk | |
parent | 3f8ded9c5c4cf0d343f992c87f6ef3b15ba6b59c (diff) |
desktop: need only one Package_scripts
Change-Id: Ia47d1cc8c2d754f74e281eac82c76fbaf12d8541
Diffstat (limited to 'desktop/Package_scripts.mk')
-rw-r--r-- | desktop/Package_scripts.mk | 24 |
1 files changed, 13 insertions, 11 deletions
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: |