diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2006-01-13 13:57:24 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2006-01-13 13:57:24 +0000 |
| commit | 8dcb630b3c5131eec55fe066823632c96f099096 (patch) | |
| tree | d86dcc3e8632b239e074ddc48ec0896040d4e823 /sysui/desktop | |
| parent | a7b38bb11d6a4c092721bd86cfaf79e8502faaae (diff) | |
INTEGRATION: CWS sysui12 (1.4.8); FILE MERGED
2005/12/19 14:12:29 obr 1.4.8.5: RESYNC: (1.5-1.6); FILE MERGED
2005/10/26 11:52:52 obr 1.4.8.4: #i46964# made packages non phony targets
2005/10/11 11:53:59 obr 1.4.8.3: #i54236# fixed parallel build problem (hopefully)
2005/10/11 07:51:13 obr 1.4.8.2: RESYNC: (1.4-1.5); FILE MERGED
2005/10/06 10:00:20 obr 1.4.8.1: #i46964# deliver desktop integration packages in version independant tgz
Diffstat (limited to 'sysui/desktop')
| -rw-r--r-- | sysui/desktop/mandriva/makefile.mk | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/sysui/desktop/mandriva/makefile.mk b/sysui/desktop/mandriva/makefile.mk index 5e4c7e2307e1..f8e6b3bb9979 100644 --- a/sysui/desktop/mandriva/makefile.mk +++ b/sysui/desktop/mandriva/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.6 $ +# $Revision: 1.7 $ # -# last change: $Author: rt $ $Date: 2005-12-14 09:41:55 $ +# last change: $Author: rt $ $Date: 2006-01-13 14:57:24 $ # # 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 \ @@ -138,7 +138,6 @@ RPMDEPN = \ $(MISC)/$(TARGET)/usr/share/icons/gnome/{$(GNOMEICONLIST)} \ $(MISC)/$(TARGET)/usr/share/icons/{$(KDEICONLIST)} -RPMDIR = $(shell cd $(BIN); pwd) ULFDIR = $(COMMONMISC)$/desktopshare .ENDIF @@ -221,10 +220,10 @@ $(MISC)/$(TARGET)/etc/$(UNIXFILENAME) : # --- packaging --------------------------------------------------- -.PHONY $(RPMFILE) : $(RPMDEPN) $(MISC)/$(TARGET)-menus.spec - -$(RM) $(@:d)/$(PKGNAME)-* - @$(RPM) -bb $(MISC)/$(TARGET)-menus.spec --buildroot $(LAUNCHERDIR) \ - --define "_rpmdir $(RPMDIR)" \ +$(RPMFILE) : $(RPMDEPN) $(MISC)/$(TARGET)-menus.spec + -$(RM) $(@:d)$/$(PKGNAME)-*.noarch.rpm $(BIN)$/noarch$/$(PKGNAME)-*.noarch.rpm + @$(RPM) $(RPMMACROS) -bb $(MISC)/$(TARGET)-menus.spec \ + --buildroot $(LAUNCHERDIR) \ --define "unixfilename $(UNIXFILENAME)" \ --define "iconprefix $(ICONPREFIX)" \ --define "version $(PKGVERSION)" --define "release $(PKGREV)" |