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 /sysui | |
| parent | 176782e3030d17a05dc7addf4f23bb465995a1db (diff) | |
gbuild: set Package default target to INSTDIR
Change-Id: I2bc45e4ba63f5faaee7389bcd9d7b3f563503186
Diffstat (limited to 'sysui')
| -rw-r--r-- | sysui/Package_desktop.mk | 2 | ||||
| -rw-r--r-- | sysui/Package_icons.mk | 2 | ||||
| -rw-r--r-- | sysui/Package_infoplist.mk | 2 | ||||
| -rw-r--r-- | sysui/Package_osxicons.mk | 2 | ||||
| -rw-r--r-- | sysui/Package_share.mk | 2 |
5 files changed, 4 insertions, 6 deletions
diff --git a/sysui/Package_desktop.mk b/sysui/Package_desktop.mk index 64984a7283ca..0f0df9b03efb 100644 --- a/sysui/Package_desktop.mk +++ b/sysui/Package_desktop.mk @@ -11,6 +11,8 @@ include $(SRCDIR)/sysui/productlist.mk $(eval $(call gb_Package_Package,desktop,$(WORKDIR)/CustomTarget)) +$(eval $(call gb_Package_set_outdir,desktop,$(OUTDIR))) + ifneq ($(filter deb,$(PKGFORMAT)),) $(eval $(call gb_Package_add_files,desktop,bin/desktop-integration/deb,\ $(foreach product,$(PRODUCTLIST),\ diff --git a/sysui/Package_icons.mk b/sysui/Package_icons.mk index 2435b86e30d4..1b1c6a2463ce 100644 --- a/sysui/Package_icons.mk +++ b/sysui/Package_icons.mk @@ -9,6 +9,8 @@ $(eval $(call gb_Package_Package,sysui/icons,$(SRCDIR)/sysui/desktop/icons)) +$(eval $(call gb_Package_set_outdir,sysui/icons,$(OUTDIR))) + $(eval $(call gb_Package_add_file,sysui/icons,bin/soffice.ico,main_app.ico)) $(eval $(call gb_Package_add_files,sysui/icons,res/icons,\ diff --git a/sysui/Package_infoplist.mk b/sysui/Package_infoplist.mk index 483a926a8227..2051da44b8d5 100644 --- a/sysui/Package_infoplist.mk +++ b/sysui/Package_infoplist.mk @@ -9,8 +9,6 @@ $(eval $(call gb_Package_Package,infoplist,$(call gb_CustomTarget_get_workdir,sysui/infoplist))) -$(eval $(call gb_Package_set_outdir,infoplist,$(INSTROOT))) - $(eval $(call gb_Package_add_files,infoplist,,\ PkgInfo \ Info.plist \ diff --git a/sysui/Package_osxicons.mk b/sysui/Package_osxicons.mk index 117227b78de3..cd8343a6e893 100644 --- a/sysui/Package_osxicons.mk +++ b/sysui/Package_osxicons.mk @@ -9,8 +9,6 @@ $(eval $(call gb_Package_Package,sysui_osxicons,$(SRCDIR)/sysui/desktop/icons)) -$(eval $(call gb_Package_set_outdir,sysui_osxicons,$(INSTROOT))) - $(eval $(call gb_Package_add_files_with_dir,sysui_osxicons,Resources,\ text.icns \ oasis-text.icns \ diff --git a/sysui/Package_share.mk b/sysui/Package_share.mk index 11122b4a26f2..3fa7cbeee59d 100644 --- a/sysui/Package_share.mk +++ b/sysui/Package_share.mk @@ -9,8 +9,6 @@ $(eval $(call gb_Package_Package,share,$(share_WORKDIR)/libreoffice)) -$(eval $(call gb_Package_set_outdir,share,$(INSTROOT))) - $(eval $(call gb_Package_add_files,share,share/xdg,\ $(addsuffix .desktop,$(LAUNCHERLIST)) \ )) |