diff options
| author | Kurt Zenker <kz@openoffice.org> | 2005-10-05 12:02:04 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2005-10-05 12:02:04 +0000 |
| commit | b544dcedf2555020742e0ff9202aef1ed7c30884 (patch) | |
| tree | de3a4ae29387921b939c931b159f03cbfd6fbce2 /sysui/desktop/suse | |
| parent | 2ea8b7a1515c7c365b21639bd44dfe4b7dcc5363 (diff) | |
INTEGRATION: CWS sysui11 (1.15.16); FILE MERGED
2005/09/13 06:31:21 obr 1.15.16.2: RESYNC: (1.15-1.16); FILE MERGED
2005/08/16 13:21:11 obr 1.15.16.1: #i52807# triggerin now runs only for initial install, updates are handled by new triggerpostun
Diffstat (limited to 'sysui/desktop/suse')
| -rw-r--r-- | sysui/desktop/suse/makefile.mk | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/sysui/desktop/suse/makefile.mk b/sysui/desktop/suse/makefile.mk index f830f51c1b71..ebe267f652d3 100644 --- a/sysui/desktop/suse/makefile.mk +++ b/sysui/desktop/suse/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.16 $ +# $Revision: 1.17 $ # -# last change: $Author: rt $ $Date: 2005-09-09 11:50:33 $ +# last change: $Author: kz $ $Date: 2005-10-05 13:02:04 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -141,7 +141,6 @@ RPMDEPN = \ RPMDIR = $(shell cd $(BIN); pwd) ULFDIR = $(COMMONMISC)$/desktopshare -SPECFILE = $(MISC)/$(TARGET)-menus.spec .ENDIF @@ -225,14 +224,9 @@ $(MISC)/$(TARGET)/etc/$(UNIXFILENAME) : @$(MKDIRHIER) $(@:d) @touch $@ -# --- specfile ---------------------------------------------------- - -$(SPECFILE) : $$(@:f) - @cat $< | tr -d "\015" >$@ - # --- packaging --------------------------------------------------- -.PHONY $(RPMFILE) : $(RPMDEPN) $(SPECFILE) +.PHONY $(RPMFILE) : $(RPMDEPN) $(MISC)/$(TARGET)-menus.spec -$(RM) $(@:d)/$(PKGNAME)-* @$(RPM) -bb $(MISC)/$(TARGET)-menus.spec --buildroot $(LAUNCHERDIR) \ --define "_builddir $(shell cd ../share; pwd)" \ |