diff options
| author | Kurt Zenker <kz@openoffice.org> | 2006-01-31 17:20:11 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2006-01-31 17:20:11 +0000 |
| commit | 6aa4ad9e6971889c874e054ed50edac4cedfea22 (patch) | |
| tree | c29d6dd4104eb678850a60287b8aafc90b245efc /sysui | |
| parent | 68062c5167482eec7a054b65004fabb92600b774 (diff) | |
INTEGRATION: CWS ause047 (1.10.32); FILE MERGED
2006/01/27 10:41:25 obr 1.10.32.1: #i60869# replaces checks for RPM and DPKG with PKGFORMAT checks
Diffstat (limited to 'sysui')
| -rw-r--r-- | sysui/desktop/share/makefile.mk | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sysui/desktop/share/makefile.mk b/sysui/desktop/share/makefile.mk index c3aae9e3bdbc..c515d53c6ac5 100644 --- a/sysui/desktop/share/makefile.mk +++ b/sysui/desktop/share/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.10 $ +# $Revision: 1.11 $ # -# last change: $Author: kz $ $Date: 2005-10-05 13:00:54 $ +# last change: $Author: kz $ $Date: 2006-01-31 18:20:11 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -66,7 +66,7 @@ LAUNCHERDEPN = ../menus/{$(LAUNCHERLIST)}.desktop LAUNCHERFLAGFILE = $(COMMONMISC)/$(TARGET)/xdg.flag MIMEINFO = $(COMMONMISC)/$(TARGET)/openoffice.org.xml -.IF "$(RPM)"!="" +.IF "$(PKGFORMAT)"!="$(PKGFORMAT:s/rpm//)" SPECFILES = \ $(MISC)/redhat-menus.spec \ $(MISC)/suse-menus.spec \ @@ -109,7 +109,7 @@ $(MIMEINFO) : $(COMMONMISC)$/$(TARGET)$/documents.ulf @$(PERL) create_mime_xml.pl $< > $(@).$(INPATH) @mv -f $(@).$(INPATH) $@ -.IF "$(RPM)"!="" +.IF "$(PKGFORMAT)"!="$(PKGFORMAT:s/rpm//)" $(SPECFILES) : add_specfile_triggers.sed symlink_triggers $(SPECFILES) : ../$$(@:b:s/-menus//)/$$(@:f) @sed -f ../share/add_specfile_triggers.sed $< | tr -d "\015" >$@ |