diff options
Diffstat (limited to 'sysui/desktop')
| -rw-r--r-- | sysui/desktop/solaris/makefile.mk | 4 | ||||
| -rw-r--r-- | sysui/desktop/solaris/pkginfo | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/sysui/desktop/solaris/makefile.mk b/sysui/desktop/solaris/makefile.mk index 9a2c606f6264..32dc11be96a9 100644 --- a/sysui/desktop/solaris/makefile.mk +++ b/sysui/desktop/solaris/makefile.mk @@ -49,7 +49,7 @@ TARGET=solaris PKGFILES = $(BIN)$/pkg$/{$(PRODUCTLIST)}-desktop-integration.tar.gz PKGDATESTRING = $(shell @date -u +%Y.%m.%d) -PKGARCH=sparc,i386 +PKGARCH=all FASPAC=`test -f $(SOLARBINDIR)/faspac-so.sh && echo "/sbin/sh" || echo "echo"` @@ -125,7 +125,9 @@ $(PKGFILES) : $(MISC)$/{$(PRODUCTLIST)}$/prototype @-$(RM) $(BIN)$/$(@:f) @$(MKDIRHIER) $(@:d) pkgmk -l 1073741824 -r . -f $(MISC)$/$(@:b:b:s/-/ /:1)$/prototype -o -d $(PKGDIR) ARCH=$(PKGARCH) VERSION=$(PKGVERSION.$(@:b:s/-/ /:1)),REV=$(PKGREV).$(PKGDATESTRING) +.IF "$(DONTCOMPRESS)"=="" $(FASPAC) $(SOLARBINDIR)/faspac-so.sh -a -d $(PKGDIR) $(@:b:b:s/-/ /:1:s/.//)$(PRODUCTVERSIONSHORT)-desktop-int +.ENDIF # "$(DONTCOMPRESS)"=="" @tar -cf - -C $(PKGDIR) $(@:b:b:s/-/ /:1:s/.//)$(PRODUCTVERSIONSHORT)-desktop-int | gzip > $@ @rm -rf $(PKGDIR)/$(@:b:b:s/-/ /:1:s/.//)$(PRODUCTVERSIONSHORT)-desktop-int diff --git a/sysui/desktop/solaris/pkginfo b/sysui/desktop/solaris/pkginfo index 8fbf60ec812f..4f7f42df8341 100644 --- a/sysui/desktop/solaris/pkginfo +++ b/sysui/desktop/solaris/pkginfo @@ -11,3 +11,6 @@ SUNW_PKGVERS=1.0 CLASSES=none build OFFICE_PATH= LEGACY_GNOME="false" +DESC=Desktop integration for %PRODUCTNAME +SUNW_PRODNAME=%PRODUCTNAME +SUNW_PRODVERS=3 |