strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

INTEGRATION: CWS ause047 (1.7.4); FILE MERGED

Browse source 
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
This commit is contained in:
Kurt Zenker 2006-01-31 17:19:33 +00:00
parent 90a598db80
commit d4e8cfa7bc
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
sysui/desktop/freedesktop/makefile.mk
View file

@ -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