diff options
| author | Kurt Zenker <kz@openoffice.org> | 2006-01-31 17:19:45 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2006-01-31 17:19:45 +0000 |
| commit | 5908c17044ea09efcf19ffb7c3dbfb7a0407b8c6 (patch) | |
| tree | 09aae699263c4061458713461d0187cd14cfa5a7 /sysui | |
| parent | d4e8cfa7bc308094b76e2f9eef1e93d413c126ba (diff) | |
INTEGRATION: CWS ause047 (1.7.4); FILE MERGED
2006/01/27 10:41:23 obr 1.7.4.2: #i60869# replaces checks for RPM and DPKG with PKGFORMAT checks
2006/01/24 15:34:20 obr 1.7.4.1: #i60869# check for $(RPM) instead of $(OS) and added missing mkdirs
Diffstat (limited to 'sysui')
| -rw-r--r-- | sysui/desktop/mandriva/makefile.mk | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/sysui/desktop/mandriva/makefile.mk b/sysui/desktop/mandriva/makefile.mk index f8e6b3bb9979..ad6ca89be397 100644 --- a/sysui/desktop/mandriva/makefile.mk +++ b/sysui/desktop/mandriva/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.7 $ +# $Revision: 1.8 $ # -# last change: $Author: rt $ $Date: 2006-01-13 14:57:24 $ +# last change: $Author: kz $ $Date: 2006-01-31 18:19:45 $ # # 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 @@ -146,7 +146,7 @@ ULFDIR = $(COMMONMISC)$/desktopshare .INCLUDE : target.mk -.IF "$(RPM)"!="" +.IF "$(PKGFORMAT)"!="$(PKGFORMAT:s/rpm//)" ALLTAR : $(RPMFILE) @@ -221,6 +221,7 @@ $(MISC)/$(TARGET)/etc/$(UNIXFILENAME) : # --- packaging --------------------------------------------------- $(RPMFILE) : $(RPMDEPN) $(MISC)/$(TARGET)-menus.spec + @-$(MKDIRHIER) $(@:d) -$(RM) $(@:d)$/$(PKGNAME)-*.noarch.rpm $(BIN)$/noarch$/$(PKGNAME)-*.noarch.rpm @$(RPM) $(RPMMACROS) -bb $(MISC)/$(TARGET)-menus.spec \ --buildroot $(LAUNCHERDIR) \ |