diff options
| author | Tor Lillqvist <tml@collabora.com> | 2013-09-25 20:33:08 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2013-09-25 22:13:23 +0200 |
| commit | aa26a065867c36a412193db9854cf2ca97154dde (patch) | |
| tree | 1aaba3d8d839f6b91e07be2b0a9eb75cc4e2e7c6 /desktop | |
| parent | 29aceccf1da7164660a430229c4ac937897e64de (diff) | |
We don't want the sbase etc scripts on OS X
Change-Id: If9748185c004b2368401373a38db92d6b61373cb
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/Package_scripts.mk | 7 | ||||
| -rw-r--r-- | desktop/Package_scripts_install.mk | 7 |
2 files changed, 12 insertions, 2 deletions
diff --git a/desktop/Package_scripts.mk b/desktop/Package_scripts.mk index f47fc8cf8706..5171cb8d42c2 100644 --- a/desktop/Package_scripts.mk +++ b/desktop/Package_scripts.mk @@ -9,7 +9,7 @@ $(eval $(call gb_Package_Package,desktop_scripts,$(SRCDIR)/desktop/scripts)) -ifneq ($(OS),WNT) +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)) @@ -18,6 +18,11 @@ $(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)) + +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)) diff --git a/desktop/Package_scripts_install.mk b/desktop/Package_scripts_install.mk index a3202071e17b..f164f720274e 100644 --- a/desktop/Package_scripts_install.mk +++ b/desktop/Package_scripts_install.mk @@ -11,7 +11,7 @@ $(eval $(call gb_Package_Package,desktop_scripts_install,$(SRCDIR)/desktop/scrip $(eval $(call gb_Package_set_outdir,desktop_scripts_install,$(INSTROOT))) -ifneq ($(OS),WNT) +ifeq (,$(filter MACOSX WNT,$(OS))) $(eval $(call gb_Package_add_file,desktop_scripts_install,$(gb_PROGRAMDIRNAME)/gdbtrace,gdbtrace)) $(eval $(call gb_Package_add_file,desktop_scripts_install,$(gb_PROGRAMDIRNAME)/sbase,sbase.sh)) @@ -20,6 +20,11 @@ $(eval $(call gb_Package_add_file,desktop_scripts_install,$(gb_PROGRAMDIRNAME)/s $(eval $(call gb_Package_add_file,desktop_scripts_install,$(gb_PROGRAMDIRNAME)/simpress,simpress.sh)) $(eval $(call gb_Package_add_file,desktop_scripts_install,$(gb_PROGRAMDIRNAME)/smath,smath.sh)) $(eval $(call gb_Package_add_file,desktop_scripts_install,$(gb_PROGRAMDIRNAME)/swriter,swriter.sh)) + +endif + +ifneq ($(OS),WNT) + $(eval $(call gb_Package_add_file,desktop_scripts_install,$(gb_PROGRAMDIRNAME)/unoinfo,unoinfo.sh)) $(eval $(call gb_Package_add_file,desktop_scripts_install,$(gb_PROGRAMDIRNAME)/unopkg,unopkg.sh)) |