summaryrefslogtreecommitdiff
path: root/sysui/desktop/mandriva
diff options
context:
space:
mode:
authorKurt Zenker <kz@openoffice.org>2005-10-05 11:58:22 +0000
committerKurt Zenker <kz@openoffice.org>2005-10-05 11:58:22 +0000
commit6d975bf0938d4839d7313c34a3e066bce291973b (patch)
treeb0ad1a954cb067087686341368056e1cb5323ab7 /sysui/desktop/mandriva
parent8fb75f66a3387f6172f351bc5bf2ae535008831b (diff)
INTEGRATION: CWS sysui11 (1.3.16); FILE MERGED
2005/09/13 06:29:33 obr 1.3.16.2: RESYNC: (1.3-1.4); FILE MERGED 2005/08/16 13:21:05 obr 1.3.16.1: #i52807# triggerin now runs only for initial install, updates are handled by new triggerpostun
Diffstat (limited to 'sysui/desktop/mandriva')
-rw-r--r--sysui/desktop/mandriva/makefile.mk12
1 files changed, 3 insertions, 9 deletions
diff --git a/sysui/desktop/mandriva/makefile.mk b/sysui/desktop/mandriva/makefile.mk
index 89a3d84328df..0d8626c564a5 100644
--- a/sysui/desktop/mandriva/makefile.mk
+++ b/sysui/desktop/mandriva/makefile.mk
@@ -4,9 +4,9 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.4 $
+# $Revision: 1.5 $
#
-# last change: $Author: rt $ $Date: 2005-09-09 11:47:41 $
+# last change: $Author: kz $ $Date: 2005-10-05 12:58:22 $
#
# The Contents of this file are made available subject to
# the terms of GNU Lesser General Public License Version 2.1.
@@ -140,7 +140,6 @@ RPMDEPN = \
RPMDIR = $(shell cd $(BIN); pwd)
ULFDIR = $(COMMONMISC)$/desktopshare
-SPECFILE = $(MISC)/$(TARGET)-menus.spec
.ENDIF
@@ -220,14 +219,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 "_rpmdir $(RPMDIR)" \