diff options
| author | Kurt Zenker <kz@openoffice.org> | 2006-01-31 17:19:18 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2006-01-31 17:19:18 +0000 |
| commit | 90a598db800bf406aecd5c0c5fcba7ef16c2868e (patch) | |
| tree | 31dd614d8fda7c968948a6c5d34fd4da57bf8416 /sysui/desktop/debian | |
| parent | 863820a7031c7c27710a9cd69d5838916ee467fd (diff) | |
INTEGRATION: CWS ause047 (1.10.4); FILE MERGED
2006/01/27 10:41:21 obr 1.10.4.1: #i60869# replaces checks for RPM and DPKG with PKGFORMAT checks
Diffstat (limited to 'sysui/desktop/debian')
| -rw-r--r-- | sysui/desktop/debian/makefile.mk | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sysui/desktop/debian/makefile.mk b/sysui/desktop/debian/makefile.mk index 0b93b779b059..47e61b6c7d0c 100644 --- a/sysui/desktop/debian/makefile.mk +++ b/sysui/desktop/debian/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.10 $ +# $Revision: 1.11 $ # -# last change: $Author: rt $ $Date: 2006-01-13 14:56:56 $ +# last change: $Author: kz $ $Date: 2006-01-31 18:19:18 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -128,7 +128,7 @@ KDEICONLIST = \ locolor/{16x16 32x32}/apps/$(ICONPREFIX)-{$(LAUNCHERLIST)}.png \ locolor/{16x16 32x32}/mimetypes/$(ICONPREFIX)-{$(MIMEICONLIST)}.png -.IF "$(DPKG)"!="" +.IF "$(PKGFORMAT)"!="$(PKGFORMAT:s/deb//)" PKGNAME=openoffice.org-$(TARGET)-menus DEBFILE=$(PKGDIR)/$(PKGNAME)_$(PKGVERSION)-$(PKGREV)_all.deb @@ -157,7 +157,7 @@ ULFDIR = $(COMMONMISC)$/desktopshare .INCLUDE : target.mk -.IF "$(DPKG)"!="" +.IF "$(PKGFORMAT)"!="$(PKGFORMAT:s/deb//)" ALLTAR : $(DEBFILE) |