diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2006-01-13 13:58:05 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2006-01-13 13:58:05 +0000 |
| commit | 12ebcfe90d9d6c2e77acbeb19fe5ade3a9a7be68 (patch) | |
| tree | 8e080961f1fbb44ce181c096f19d02d726aeb07b /sysui | |
| parent | 5e746ea67c4a7ffc7b666edf5c4a12971fb936ce (diff) | |
INTEGRATION: CWS sysui12 (1.16.8); FILE MERGED
2005/12/19 14:13:11 obr 1.16.8.5: RESYNC: (1.17-1.18); FILE MERGED
2005/10/26 11:52:53 obr 1.16.8.4: #i46964# made packages non phony targets
2005/10/11 11:54:02 obr 1.16.8.3: #i54236# fixed parallel build problem (hopefully)
2005/10/11 07:53:12 obr 1.16.8.2: RESYNC: (1.16-1.17); FILE MERGED
2005/10/06 10:00:28 obr 1.16.8.1: #i46964# deliver desktop integration packages in version independant tgz
Diffstat (limited to 'sysui')
| -rw-r--r-- | sysui/desktop/suse/makefile.mk | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/sysui/desktop/suse/makefile.mk b/sysui/desktop/suse/makefile.mk index 10da2f0e97e3..3f899bb83e0b 100644 --- a/sysui/desktop/suse/makefile.mk +++ b/sysui/desktop/suse/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.18 $ +# $Revision: 1.19 $ # -# last change: $Author: rt $ $Date: 2005-12-14 09:42:32 $ +# last change: $Author: rt $ $Date: 2006-01-13 14:58:05 $ # # 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 \ @@ -139,7 +139,6 @@ RPMDEPN = \ $(MISC)/$(TARGET)/opt/gnome/share/icons/gnome/{$(GNOMEICONLIST)} \ $(MISC)/$(TARGET)/opt/kde3/share/icons/{$(KDEICONLIST)} -RPMDIR = $(shell cd $(BIN); pwd) ULFDIR = $(COMMONMISC)$/desktopshare .ENDIF @@ -226,11 +225,11 @@ $(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)-*.noarch.rpm $(BIN)$/noarch$/$(PKGNAME)-*.noarch.rpm + @$(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)" |