diff options
| author | David Tardon <dtardon@redhat.com> | 2013-05-04 08:03:56 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2013-05-04 16:44:47 +0200 |
| commit | 2dcf42b417c6246a5f6d14e8297510c751b1da96 (patch) | |
| tree | 304fcb190535be9a3685c1cf24053cffc009b2d9 /extras | |
| parent | 2f8d2c4ce4652e4e906eada7d248556db9bdc666 (diff) | |
install data files from extras using filelists
Change-Id: Ib092623501e36fa759a5215a435d21e1fea8dfdd
Diffstat (limited to 'extras')
| -rw-r--r-- | extras/Package_glade.mk | 4 | ||||
| -rw-r--r-- | extras/Package_labels.mk | 4 | ||||
| -rw-r--r-- | extras/Package_newfiles.mk | 4 |
3 files changed, 9 insertions, 3 deletions
diff --git a/extras/Package_glade.mk b/extras/Package_glade.mk index 1ac1f690786a..00b818f96a07 100644 --- a/extras/Package_glade.mk +++ b/extras/Package_glade.mk @@ -9,6 +9,8 @@ $(eval $(call gb_Package_Package,extras_glade,$(call gb_CustomTarget_get_workdir,extras/source/glade))) -$(eval $(call gb_Package_add_file,extras_glade,pck/libreoffice-catalog.xml,libreoffice-catalog.xml)) +$(eval $(call gb_Package_set_outdir,extras_glade,$(INSTDIR))) + +$(eval $(call gb_Package_add_file,extras_glade,share/glade/libreoffice-catalog.xml,libreoffice-catalog.xml)) # vim: set noet sw=4 ts=4: diff --git a/extras/Package_labels.mk b/extras/Package_labels.mk index 6291b13803d0..24ff8650c16b 100644 --- a/extras/Package_labels.mk +++ b/extras/Package_labels.mk @@ -9,6 +9,8 @@ $(eval $(call gb_Package_Package,extras_labels,$(SRCDIR)/extras/source/labels)) -$(eval $(call gb_Package_add_file,extras_labels,pck/labels.xml,labels.xml)) +$(eval $(call gb_Package_set_outdir,extras_labels,$(INSTDIR))) + +$(eval $(call gb_Package_add_file,extras_labels,share/labels/labels.xml,labels.xml)) # vim: set noet sw=4 ts=4: diff --git a/extras/Package_newfiles.mk b/extras/Package_newfiles.mk index cf457d94faa7..aebad8985a7d 100644 --- a/extras/Package_newfiles.mk +++ b/extras/Package_newfiles.mk @@ -9,7 +9,9 @@ $(eval $(call gb_Package_Package,extras_newfiles,$(SRCDIR)/extras/source/shellnew)) -$(eval $(call gb_Package_add_files,extras_newfiles,pck,\ +$(eval $(call gb_Package_set_outdir,extras_newfiles,$(INSTDIR))) + +$(eval $(call gb_Package_add_files,extras_newfiles,share/template/shellnew,\ soffice.odg \ soffice.odp \ soffice.ods \ |