diff options
| author | Kurt Zenker <kz@openoffice.org> | 2006-01-31 17:20:41 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2006-01-31 17:20:41 +0000 |
| commit | 8f0f2ee5d6cc038d16a0334f5d8c3104920af93e (patch) | |
| tree | f4f3f40d02677b286b2ff20d834252f164130c04 /sysui/desktop | |
| parent | f469937acbc261a2dc9a42c4f58030564f6167d1 (diff) | |
INTEGRATION: CWS ause047 (1.11.4); FILE MERGED
2006/01/27 10:41:29 obr 1.11.4.2: #i60869# replaces checks for RPM and DPKG with PKGFORMAT checks
2006/01/24 15:34:23 obr 1.11.4.1: #i60869# check for $(RPM) instead of $(OS) and added missing mkdirs
Diffstat (limited to 'sysui/desktop')
| -rw-r--r-- | sysui/desktop/util/makefile.mk | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/sysui/desktop/util/makefile.mk b/sysui/desktop/util/makefile.mk index a64e3f598914..e21967538d89 100644 --- a/sysui/desktop/util/makefile.mk +++ b/sysui/desktop/util/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.11 $ +# $Revision: 1.12 $ # -# last change: $Author: rt $ $Date: 2006-01-13 14:58:26 $ +# last change: $Author: kz $ $Date: 2006-01-31 18:20:41 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -81,12 +81,13 @@ PKGCONFIG_LIBS!:=-Wl,--export-dynamic $(PKGCONFIG_LIBS) .ENDIF # "$(ENABLE_GNOMEVFS)"!="" -.IF "$(OS)"!="SOLARIS" +.IF "$(PKGFORMAT)"!="$(PKGFORMAT:s/rpm//)" TARFILE=$(BIN)$/rpm$/openoffice.org-desktop-integration.tar.gz -.IF "$(DPKG)" != "" +.ENDIF + +.IF "$(PKGFORMAT)"!="$(PKGFORMAT:s/deb//)" TARFILE2=$(BIN)$/deb$/openoffice.org-desktop-integration.tar.gz -.ENDIF # "$(DPKG)" != "" -.ENDIF # "$(OS)"!="SOLARIS" +.ENDIF # --- Files -------------------------------------------------------- @@ -113,17 +114,18 @@ $(SCRIPTS) : $$(@:f) +@cat $(@:f) | tr -d "\015" > $@ +@chmod 555 $@ -.IF "$(OS)"!="SOLARIS" +.IF "$(TARFILE)" != "" $(TARFILE) : $(PKGDIR)$/{$(shell ls $(PKGDIR))} $(MKDIRHIER) $(@:d) tar -C $(PKGDIR:d:d) -cf - $(PKGDIR:f)/ | gzip > $@ -.ENDIF -.IF "$(DPKG)" != "" +.ENDIF # "$(TARFILE)" != "" + +.IF "$(TARFILE2)" != "" $(TARFILE2) : $(shell ls $(PKGDIR)$/*.deb) $(MKDIRHIER) $(@:d) tar -C $(PKGDIR) -cf - {$(<:f)} | gzip > $@ -.ENDIF # IF "$(DPKG)" != "" +.ENDIF |