diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2008-04-15 13:47:52 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2008-04-15 13:47:52 +0000 |
| commit | 2c1d538afd822ecea8b95fe4915f5580eb05fe6e (patch) | |
| tree | 86ea310c102e448ef92c5f263c2de46ce2e71d60 /sysui/desktop/solaris | |
| parent | e7e30f6cfd9f036afd625e62fc5c0e2a5386f3a1 (diff) | |
INTEGRATION: CWS native141 (1.19.8); FILE MERGED
2008/04/04 10:44:56 obr 1.19.8.2: #i87732# second try
2008/04/03 09:54:41 obr 1.19.8.1: #i87732# rename packages two allow installation in parallel with 2.x
Diffstat (limited to 'sysui/desktop/solaris')
| -rw-r--r-- | sysui/desktop/solaris/makefile.mk | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sysui/desktop/solaris/makefile.mk b/sysui/desktop/solaris/makefile.mk index 6fab2f9780f1..69632a0b4064 100644 --- a/sysui/desktop/solaris/makefile.mk +++ b/sysui/desktop/solaris/makefile.mk @@ -8,7 +8,7 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.20 $ +# $Revision: 1.21 $ # # This file is part of OpenOffice.org. # @@ -99,8 +99,8 @@ $(PKGFILES) : $(MISC)$/{$(PRODUCTLIST)}$/prototype @-$(RM) $(BIN)$/$(@:f) @$(MKDIRHIER) $(@:d) pkgmk -r . -f $(MISC)$/$(@:b:b:s/-/ /:1)$/prototype -o -d $(PKGDIR) ARCH=$(PKGARCH) VERSION=$(PKGVERSION.$(@:b:s/-/ /:1)),REV=$(PKGREV).$(PKGDATESTRING) - $(FASPAC) $(SOLARBINDIR)/faspac-so.sh -a -d $(PKGDIR) $(@:b:b:s/-/ /:1:s/.//)-desktop-integratn - @tar -cf - -C $(PKGDIR) $(@:b:b:s/-/ /:1:s/.//)-desktop-integratn | gzip > $@ - @rm -rf $(PKGDIR)/$(@:b:b:s/-/ /:1:s/.//)-desktop-integratn + $(FASPAC) $(SOLARBINDIR)/faspac-so.sh -a -d $(PKGDIR) $(@:b:b:s/-/ /:1:s/.//)30-desktop-int + @tar -cf - -C $(PKGDIR) $(@:b:b:s/-/ /:1:s/.//)30-desktop-int | gzip > $@ + @rm -rf $(PKGDIR)/$(@:b:b:s/-/ /:1:s/.//)-desktop-int30 .ENDIF |