diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-10-28 19:30:11 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-10-28 20:17:26 +0100 |
| commit | 8df17a34095dce7db16d9d2e505043f806704f66 (patch) | |
| tree | 80695a18d5364344e1ac1ee376200a96fe569268 /desktop | |
| parent | 176782e3030d17a05dc7addf4f23bb465995a1db (diff) | |
gbuild: set Package default target to INSTDIR
Change-Id: I2bc45e4ba63f5faaee7389bcd9d7b3f563503186
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/Package_branding.mk | 2 | ||||
| -rw-r--r-- | desktop/Package_branding_custom.mk | 2 | ||||
| -rw-r--r-- | desktop/Package_desktop_install.mk | 2 | ||||
| -rw-r--r-- | desktop/Package_scripts.mk | 2 | ||||
| -rw-r--r-- | desktop/Package_soffice_sh.mk | 2 |
5 files changed, 0 insertions, 10 deletions
diff --git a/desktop/Package_branding.mk b/desktop/Package_branding.mk index a7f9bc0e2def..4cd39c8ca3fa 100644 --- a/desktop/Package_branding.mk +++ b/desktop/Package_branding.mk @@ -9,8 +9,6 @@ $(eval $(call gb_Package_Package,desktop_branding,$(SRCDIR)/icon-themes/galaxy)) -$(eval $(call gb_Package_set_outdir,desktop_branding,$(INSTROOT))) - $(eval $(call gb_Package_add_files,desktop_branding,$(LIBO_ETC_FOLDER),\ $(foreach image,$(filter $(BRAND_INTRO_IMAGES),$(DEFAULT_BRAND_IMAGES)),\ $(if $(filter intro.png,$(image)),\ diff --git a/desktop/Package_branding_custom.mk b/desktop/Package_branding_custom.mk index 456d545ee7c0..c2b6181f9c8f 100644 --- a/desktop/Package_branding_custom.mk +++ b/desktop/Package_branding_custom.mk @@ -9,8 +9,6 @@ $(eval $(call gb_Package_Package,desktop_branding_custom,$(CUSTOM_BRAND_DIR))) -$(eval $(call gb_Package_set_outdir,desktop_branding_custom,$(INSTROOT))) - $(eval $(call gb_Package_add_files,desktop_branding_custom,$(LIBO_ETC_FOLDER),\ $(filter $(BRAND_INTRO_IMAGES),$(CUSTOM_BRAND_IMAGES)) \ )) diff --git a/desktop/Package_desktop_install.mk b/desktop/Package_desktop_install.mk index ad7a74ca8172..00d75467ff7f 100644 --- a/desktop/Package_desktop_install.mk +++ b/desktop/Package_desktop_install.mk @@ -9,8 +9,6 @@ $(eval $(call gb_Package_Package,desktop_install,$(SRCDIR))) -$(eval $(call gb_Package_set_outdir,desktop_install,$(INSTROOT))) - $(eval $(call gb_Package_add_symbolic_link,desktop_install,program,MacOS)) # vim: set noet sw=4 ts=4: diff --git a/desktop/Package_scripts.mk b/desktop/Package_scripts.mk index 046ba69dc5cd..4ed94ad2f0d4 100644 --- a/desktop/Package_scripts.mk +++ b/desktop/Package_scripts.mk @@ -9,8 +9,6 @@ $(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)) diff --git a/desktop/Package_soffice_sh.mk b/desktop/Package_soffice_sh.mk index c0aadbdbd3e7..046c95f45996 100644 --- a/desktop/Package_soffice_sh.mk +++ b/desktop/Package_soffice_sh.mk @@ -9,8 +9,6 @@ $(eval $(call gb_Package_Package,desktop_soffice_sh,$(call gb_CustomTarget_get_workdir,desktop/soffice))) -$(eval $(call gb_Package_set_outdir,desktop_soffice_sh,$(INSTROOT))) - $(eval $(call gb_Package_add_file,desktop_soffice_sh,$(LIBO_BIN_FOLDER)/soffice,soffice.sh)) # vim:set noet sw=4 ts=4: |