diff options
| author | Kurt Zenker <kz@openoffice.org> | 2006-01-31 17:19:57 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2006-01-31 17:19:57 +0000 |
| commit | 68062c5167482eec7a054b65004fabb92600b774 (patch) | |
| tree | df57c6c8c5e99bbb5c36bbed200a7abf30931699 /sysui/desktop | |
| parent | 5908c17044ea09efcf19ffb7c3dbfb7a0407b8c6 (diff) | |
INTEGRATION: CWS ause047 (1.18.4); FILE MERGED
2006/01/27 10:41:24 obr 1.18.4.2: #i60869# replaces checks for RPM and DPKG with PKGFORMAT checks
2006/01/24 15:34:21 obr 1.18.4.1: #i60869# check for $(RPM) instead of $(OS) and added missing mkdirs
Diffstat (limited to 'sysui/desktop')
| -rw-r--r-- | sysui/desktop/redhat/makefile.mk | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/sysui/desktop/redhat/makefile.mk b/sysui/desktop/redhat/makefile.mk index 23ef801d0fc2..8da4bb0c3cc8 100644 --- a/sysui/desktop/redhat/makefile.mk +++ b/sysui/desktop/redhat/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.18 $ +# $Revision: 1.19 $ # -# last change: $Author: rt $ $Date: 2006-01-13 14:57:38 $ +# last change: $Author: kz $ $Date: 2006-01-31 18:19:57 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -121,7 +121,7 @@ KDEICONLIST = \ locolor/{16x16 32x32}/apps/$(ICONPREFIX)-{$(LAUNCHERLIST)}.png \ locolor/{16x16 32x32}/mimetypes/$(ICONPREFIX)-{$(MIMEICONLIST)}.png -.IF "$(RPM)"!="" +.IF "$(PKGFORMAT)"!="$(PKGFORMAT:s/rpm//)" PKGNAME=$(shell sed -n -e 's/^Name: //p' $(TARGET)-menus.spec) RPMFILE=$(PKGDIR)/$(PKGNAME)-$(PKGVERSION)-$(PKGREV).noarch.rpm @@ -148,7 +148,7 @@ ULFDIR = $(COMMONMISC)$/desktopshare .INCLUDE : target.mk -.IF "$(RPM)"!="" +.IF "$(PKGFORMAT)"!="$(PKGFORMAT:s/rpm//)" ALLTAR : $(RPMFILE) @@ -227,6 +227,7 @@ $(MISC)/$(TARGET)/etc/$(UNIXFILENAME) : # --- packaging --------------------------------------------------- $(RPMFILE) : $(RPMDEPN) $(MISC)/$(TARGET)-menus.spec + @-$(MKDIRHIER) $(@:d) -$(RM) $(@:d)$/$(PKGNAME)-* $(BIN)$/noarch$/$(PKGNAME)-* @$(RPM) -bb $(MISC)/$(TARGET)-menus.spec $(RPMMACROS) \ --buildroot $(LAUNCHERDIR) \ |