diff options
Diffstat (limited to 'sysui')
-rw-r--r-- | sysui/desktop/productversion.mk | 7 | ||||
-rw-r--r-- | sysui/desktop/slackware/makefile.mk | 4 | ||||
-rw-r--r-- | sysui/desktop/solaris/makefile.mk | 2 | ||||
-rw-r--r-- | sysui/desktop/util/makefile.mk | 4 |
4 files changed, 7 insertions, 10 deletions
diff --git a/sysui/desktop/productversion.mk b/sysui/desktop/productversion.mk index c957ea844f36..fb8570b36b37 100644 --- a/sysui/desktop/productversion.mk +++ b/sysui/desktop/productversion.mk @@ -33,7 +33,7 @@ PKGREV = $(LAST_MINOR:s/m//:s/s/./) ABSLOCALOUT:=$(shell @cd $(PRJ) && pwd)$/$(ROUT) # create desktop-integration subfolder on linux -.IF "$(OS)"=="LINUX" +.IF "$(OS)"=="LINUX" || "$(OS)"=="AIX" # rpm seems to require absolute paths here :( PKGDIR:=$(ABSLOCALOUT)$/bin$/desktop-integration RPMMACROS= \ @@ -43,11 +43,8 @@ RPMMACROS= \ PKGDIR=$(BIN) .ENDIF -PRODUCTLIST = libreoffice broffice.org +.INCLUDE : productversion.mk -# default values to minimize maintainance effort -PRODUCTVERSION = 3.3 -PRODUCTVERSIONSHORT = 3 PKGVERSION = $(PRODUCTVERSION) # gnome-vfs treats everything behind the last '.' as an icon extension, # even though the "icon_filename" in '.keys' is specified as filename diff --git a/sysui/desktop/slackware/makefile.mk b/sysui/desktop/slackware/makefile.mk index 6fde1caf6528..bc4c74c0cf96 100644 --- a/sysui/desktop/slackware/makefile.mk +++ b/sysui/desktop/slackware/makefile.mk @@ -92,7 +92,7 @@ $(MISC)/$(TARGET)/usr/share/applications/ : $(MISC)/$(TARGET)/empty.tar : @$(MKDIRHIER) $(@:d)/empty - @tar -C $(MISC)/$(TARGET)/empty --owner=root --group=root --same-owner -cf $@ . + @$(GNUTAR) -C $(MISC)/$(TARGET)/empty --owner=root --group=root --same-owner -cf $@ . # --- packaging --------------------------------------------------- @@ -104,7 +104,7 @@ $(MENUFILES) : $(MISC)/$(TARGET)/empty.tar -$(RM) -r $(MISC)$/$(@:b) dmake $(MISC)$/$(@:b)$/usr/share/applications $(MISC)$/$(@:b)$/install$/slack-desc $(MISC)$/$(@:b)$/install$/doinst.sh @$(COPY) $(MISC)/$(TARGET)$/empty.tar $@.tmp - @tar -C $(MISC)/$(@:b) --owner=root --group=root --same-owner --exclude application.flag -rf $@.tmp install usr opt + @$(GNUTAR) -C $(MISC)/$(@:b) --owner=root --group=root --same-owner --exclude application.flag -rf $@.tmp install usr opt @gzip < $@.tmp > $@ @$(RM) $@.tmp $(RM) -r $(MISC)$/$(@:b) diff --git a/sysui/desktop/solaris/makefile.mk b/sysui/desktop/solaris/makefile.mk index d2ffc8cdfc1e..f74dae146e84 100644 --- a/sysui/desktop/solaris/makefile.mk +++ b/sysui/desktop/solaris/makefile.mk @@ -124,7 +124,7 @@ $(PKGFILES) : $(MISC)$/{$(PRODUCTLIST)}$/prototype .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 > $@ + @$(GNUTAR) -cf - -C $(PKGDIR) $(@:b:b:s/-/ /:1:s/.//)$(PRODUCTVERSIONSHORT)-desktop-int | gzip > $@ @rm -rf $(PKGDIR)/$(@:b:b:s/-/ /:1:s/.//)$(PRODUCTVERSIONSHORT)-desktop-int .ENDIF diff --git a/sysui/desktop/util/makefile.mk b/sysui/desktop/util/makefile.mk index a8c6feaaa14a..8255cc08ca50 100644 --- a/sysui/desktop/util/makefile.mk +++ b/sysui/desktop/util/makefile.mk @@ -53,7 +53,7 @@ ALLTAR: $(RPMTARFILES) $(DEBTARFILES) $(RPMTARFILES) : $(PKGDIR) $(MKDIRHIER) $(@:d) - tar -C $(PKGDIR:d:d) -cf - $(PKGDIR:f)$/{$(shell cd $(PKGDIR); ls $(@:b:b:s/-/ /:1)*.rpm)} | gzip > $@ + $(GNUTAR) -C $(PKGDIR:d:d) -cf - $(PKGDIR:f)$/{$(shell cd $(PKGDIR); ls $(@:b:b:s/-/ /:1)*.rpm)} | gzip > $@ .ENDIF # "$(TARFILE)" != "" @@ -61,6 +61,6 @@ $(RPMTARFILES) : $(PKGDIR) $(DEBTARFILES) : $(PKGDIR) $(MKDIRHIER) $(@:d) - tar -C $(PKGDIR:d:d) -cf - $(PKGDIR:f)$/{$(shell @cd $(PKGDIR); ls $(@:b:b:s/-/ /:1)*.deb)} | gzip > $@ + $(GNUTAR) -C $(PKGDIR:d:d) -cf - $(PKGDIR:f)$/{$(shell @cd $(PKGDIR); ls $(@:b:b:s/-/ /:1)*.deb)} | gzip > $@ .ENDIF |