From 946e406f9cfbc388407980c5148ff9ebf1131f49 Mon Sep 17 00:00:00 2001 From: Rüdiger Timm Date: Fri, 13 Jan 2006 13:57:38 +0000 Subject: INTEGRATION: CWS sysui12 (1.15.8); FILE MERGED 2005/12/19 14:12:43 obr 1.15.8.5: RESYNC: (1.16-1.17); FILE MERGED 2005/10/26 11:52:53 obr 1.15.8.4: #i46964# made packages non phony targets 2005/10/11 11:54:00 obr 1.15.8.3: #i54236# fixed parallel build problem (hopefully) 2005/10/11 07:51:36 obr 1.15.8.2: RESYNC: (1.15-1.16); FILE MERGED 2005/10/06 10:00:23 obr 1.15.8.1: #i46964# deliver desktop integration packages in version independant tgz --- sysui/desktop/redhat/makefile.mk | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'sysui/desktop') diff --git a/sysui/desktop/redhat/makefile.mk b/sysui/desktop/redhat/makefile.mk index 934a4c59dbf7..23ef801d0fc2 100644 --- a/sysui/desktop/redhat/makefile.mk +++ b/sysui/desktop/redhat/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.17 $ +# $Revision: 1.18 $ # -# last change: $Author: rt $ $Date: 2005-12-14 09:42:09 $ +# last change: $Author: rt $ $Date: 2006-01-13 14:57:38 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -54,7 +54,7 @@ ICONPREFIX = $(UNIXFILENAME:s/.//g) LAUNCHERLIST = writer calc draw impress math base printeradmin LAUNCHERDEPN = $(foreach,i,$(LAUNCHERLIST) $(UNIXFILENAME)-$i.desktop) -LAUNCHERDIR = $(shell cd $(MISC)$/$(TARGET); pwd) +LAUNCHERDIR = $(ABSLOCALOUT)$/misc$/$(TARGET) MIMELIST = \ text \ @@ -124,7 +124,7 @@ KDEICONLIST = \ .IF "$(RPM)"!="" PKGNAME=$(shell sed -n -e 's/^Name: //p' $(TARGET)-menus.spec) -RPMFILE=$(BIN)/noarch/$(PKGNAME)-$(PKGVERSION)-$(PKGREV).noarch.rpm +RPMFILE=$(PKGDIR)/$(PKGNAME)-$(PKGVERSION)-$(PKGREV).noarch.rpm RPMDEPN = \ $(MISC)/$(TARGET)/etc/$(UNIXFILENAME) \ $(MISC)/$(TARGET)/usr/bin/soffice \ @@ -140,7 +140,6 @@ RPMDEPN = \ $(MISC)/$(TARGET)/usr/share/icons/gnome/{$(GNOMEICONLIST)} \ $(MISC)/$(TARGET)/usr/share/icons/{$(KDEICONLIST)} -RPMDIR = $(shell cd $(BIN); pwd) ULFDIR = $(COMMONMISC)$/desktopshare .ENDIF @@ -227,12 +226,13 @@ $(MISC)/$(TARGET)/etc/$(UNIXFILENAME) : # --- packaging --------------------------------------------------- -.PHONY $(RPMFILE) : $(RPMDEPN) $(MISC)/$(TARGET)-menus.spec - -$(RM) $(@:d)/$(PKGNAME)-* - @$(RPM) -bb $(MISC)/$(TARGET)-menus.spec --buildroot $(LAUNCHERDIR) \ +$(RPMFILE) : $(RPMDEPN) $(MISC)/$(TARGET)-menus.spec + -$(RM) $(@:d)$/$(PKGNAME)-* $(BIN)$/noarch$/$(PKGNAME)-* + @$(RPM) -bb $(MISC)/$(TARGET)-menus.spec $(RPMMACROS) \ + --buildroot $(LAUNCHERDIR) \ --define "_builddir $(shell cd ../share; pwd)" \ - --define "_rpmdir $(RPMDIR)" \ --define "unixfilename $(UNIXFILENAME)" \ --define "version $(PKGVERSION)" --define "release $(PKGREV)" + @touch $(MISC)$/$(TARGET).rpmflag .ENDIF -- cgit v1.2.3