summaryrefslogtreecommitdiff
path: root/sysui
diff options
context:
space:
mode:
authorRichard PALO <richard@NetBSD.org>2014-11-10 17:45:39 +0100
committerAndras Timar <andras.timar@collabora.com>2014-11-23 14:32:19 +0100
commitb85199719a164bebef22589b402c3f1be3951caa (patch)
tree1f8094b9812255c7a2071b4ebc6374112b1b2a13 /sysui
parent21d4e550d4c1e79ef0abbc183821e7c2c27c383e (diff)
update solaris directories being referenced
also borrowed from Gabriele Bulfon <gabriele.bulfon at sonicle.com> Change-Id: I17787fbbf12f1bc8b3e78b8dd2e8b33679bab5b1 Signed-off-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit 457105c7d9ede7a4d73d69d1c87306e88d57c0ac)
Diffstat (limited to 'sysui')
-rw-r--r--sysui/CustomTarget_solaris.mk6
1 files changed, 3 insertions, 3 deletions
diff --git a/sysui/CustomTarget_solaris.mk b/sysui/CustomTarget_solaris.mk
index 9f671a8c2a49..ed264fe95960 100644
--- a/sysui/CustomTarget_solaris.mk
+++ b/sysui/CustomTarget_solaris.mk
@@ -45,11 +45,11 @@ $(solaris_WORKDIR)/%/postinstall: $(solaris_SRCDIR)/postinstall
$(solaris_WORKDIR)/%/postremove: $(solaris_SRCDIR)/postremove
cat $< | tr -d "\015" > $@
-$(solaris_WORKDIR)/%/mailcap: $(solaris_SRCDIR)/prototype
+$(solaris_WORKDIR)/%/prototype: $(solaris_SRCDIR)/prototype
cat $< | tr -d "\015" | sed -e "s/%PREFIX/$(UNIXFILENAME.$*)/g" -e "s_%SOURCE_$(call gb_CustomTarget_get_workdir,sysui/share)/$*_g" -e "s/%ICONPREFIX/$(UNIXFILENAME.$*)/g" > $@
-$(solaris_WORKDIR)/%-desktop-integration.tar.gz: $(solaris_WORKDIR)/copyright $(solaris_WORKDIR)/pkginfo $(solaris_WORKDIR)/depend $(solaris_WORKDIR)/mailcap $(solaris_WORKDIR)/postinstall $(solaris_WORKDIR)/postremove $(solaris_WORKDIR)/prototype $(call gb_CustomTarget_get_workdir,sysui/share)/%/openoffice.org.xml
- pkgmk -l 1073741824 -r $(solaris_WORKDIR) -f $(solaris_WORKDIR)/$*/prototype -o -d $(solaris_WORKDIR) ARCH=all VERSION=$(PKGVERSION.$*)
+$(solaris_WORKDIR)/%-desktop-integration.tar.gz: $(solaris_WORKDIR)/%/copyright $(solaris_WORKDIR)/%/pkginfo $(solaris_WORKDIR)/%/depend $(solaris_WORKDIR)/%/mailcap $(solaris_WORKDIR)/%/postinstall $(solaris_WORKDIR)/%/postremove $(solaris_WORKDIR)/%/prototype $(call gb_CustomTarget_get_workdir,sysui/share)/%/openoffice.org.xml
+# pkgmk -l 1073741824 -r $(solaris_WORKDIR) -f $(solaris_WORKDIR)/$*/prototype -o -d $(solaris_WORKDIR) ARCH=all VERSION=$(PKGVERSION.$*)
$(GNUTAR) -cf - -C $(solaris_WORKDIR) $*$(LIBO_MAJOR) -desktop-int | gzip > $@
# vim: set noet sw=4 ts=4: