diff options
| author | Kurt Zenker <kz@openoffice.org> | 2008-05-06 09:31:50 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2008-05-06 09:31:50 +0000 |
| commit | dcc7b416fb809463652b57d40e79d7fb2b78d19c (patch) | |
| tree | eed12495d8242253fcf689c1fd6595577cb0d065 /sysui | |
| parent | dab581a89285f0530e89f5ac9f70549bc6a0d834 (diff) | |
INTEGRATION: CWS native147 (1.25.4); FILE MERGED
2008/04/23 20:26:47 obr 1.25.4.1: #i88334#,#i61569#,#i62176# removed /etc indirection and package database check for office install location
Diffstat (limited to 'sysui')
| -rw-r--r-- | sysui/desktop/share/makefile.mk | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/sysui/desktop/share/makefile.mk b/sysui/desktop/share/makefile.mk index 656f63c80d38..b9bceeff25aa 100644 --- a/sysui/desktop/share/makefile.mk +++ b/sysui/desktop/share/makefile.mk @@ -8,7 +8,7 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.25 $ +# $Revision: 1.26 $ # # This file is part of OpenOffice.org. # @@ -118,10 +118,6 @@ ICONDEPN = \ ../icons/locolor/{16x16 32x32}/apps/{$(LAUNCHERLIST:s/qstart//:s/extensionmgr//)}.png \ ../icons/locolor/{16x16 32x32}/mimetypes/{$(MIMEICONLIST)}.png -.IF "$(PKGFORMAT)"!="$(PKGFORMAT:s/rpm//)" -SPECFILES = $(MISC)$/{redhat suse freedesktop mandriva}-menus.spec -.ENDIF - # --- Targets ------------------------------------------------------ .INCLUDE : target.mk @@ -162,12 +158,6 @@ $(COMMONMISC)$/{$(PRODUCTLIST)}$/openoffice.org.xml : $(ULFDIR)$/documents.ulf @$(PERL) create_mime_xml.pl $< > $@.$(INPATH) @mv -f $@.$(INPATH) $@ -.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" >$@ -.ENDIF - # # Create GNOME mime-info files # |