diff options
| author | Kurt Zenker <kz@openoffice.org> | 2006-01-31 17:19:33 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2006-01-31 17:19:33 +0000 |
| commit | d4e8cfa7bc308094b76e2f9eef1e93d413c126ba (patch) | |
| tree | a9e4751ea5be180c70947d744112fc047b1ef58d /sysui | |
| parent | 90a598db800bf406aecd5c0c5fcba7ef16c2868e (diff) | |
INTEGRATION: CWS ause047 (1.7.4); FILE MERGED
2006/01/27 10:41:22 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/freedesktop/makefile.mk | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/sysui/desktop/freedesktop/makefile.mk b/sysui/desktop/freedesktop/makefile.mk index 469ae52eb918..7a8f306ed7f7 100644 --- a/sysui/desktop/freedesktop/makefile.mk +++ b/sysui/desktop/freedesktop/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:10 $ +# last change: $Author: kz $ $Date: 2006-01-31 18:19:33 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -49,7 +49,7 @@ TARGET=freedesktop # --- Files -------------------------------------------------------- -.IF "$(RPM)"!="" +.IF "$(PKGFORMAT)"!="$(PKGFORMAT:s/rpm//)" PACKAGE_RPM = $(MISC)$/$(TARGET).rpmflag @@ -59,7 +59,7 @@ PACKAGE_RPM = $(MISC)$/$(TARGET).rpmflag .INCLUDE : target.mk -.IF "$(RPM)"!="" +.IF "$(PKGFORMAT)"!="$(PKGFORMAT:s/rpm//)" ALLTAR : $(PACKAGE_RPM) @@ -68,6 +68,7 @@ ALLTAR : $(PACKAGE_RPM) $(PACKAGE_RPM) : $(MISC)$/redhat.rpmflag $(PACKAGE_RPM) : $(MISC)/$(TARGET)-menus.spec + @-$(MKDIRHIER) $(@:d) -@$(RM) $(PKGDIR)$/openoffice.org-$(TARGET)-*.noarch.rpm $(BIN)/noarch/openoffice.org-$(TARGET)-*.noarch.rpm @$(MKDIRHIER) $(MISC)$/$(TARGET) @$(MKDIRHIER) $(MISC)$/$(TARGET)$/BUILD |