diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2006-01-13 13:57:10 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2006-01-13 13:57:10 +0000 |
| commit | a7b38bb11d6a4c092721bd86cfaf79e8502faaae (patch) | |
| tree | 291f31a0404a72f4af5708b683a7446bf0b24288 /sysui/desktop/freedesktop | |
| parent | 2a43cf078a054c1e6a21ccfa9f0605e646e394b5 (diff) | |
INTEGRATION: CWS sysui12 (1.5.8); FILE MERGED
2005/10/26 11:54:59 obr 1.5.8.5: #i46964# do not write into source tree
2005/10/26 11:52:52 obr 1.5.8.4: #i46964# made packages non phony targets
2005/10/11 11:53:56 obr 1.5.8.3: #i54236# fixed parallel build problem (hopefully)
2005/10/11 07:51:03 obr 1.5.8.2: RESYNC: (1.5-1.6); FILE MERGED
2005/10/06 10:00:18 obr 1.5.8.1: #i46964# deliver desktop integration packages in version independant tgz
Diffstat (limited to 'sysui/desktop/freedesktop')
| -rw-r--r-- | sysui/desktop/freedesktop/makefile.mk | 26 |
1 files changed, 15 insertions, 11 deletions
diff --git a/sysui/desktop/freedesktop/makefile.mk b/sysui/desktop/freedesktop/makefile.mk index 08d277d9edb9..469ae52eb918 100644 --- a/sysui/desktop/freedesktop/makefile.mk +++ b/sysui/desktop/freedesktop/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.6 $ +# $Revision: 1.7 $ # -# last change: $Author: kz $ $Date: 2005-10-05 12:57:58 $ +# last change: $Author: rt $ $Date: 2006-01-13 14:57:10 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -50,9 +50,9 @@ TARGET=freedesktop # --- Files -------------------------------------------------------- .IF "$(RPM)"!="" - -RPMDIR = $(shell cd $(BIN); pwd) - + +PACKAGE_RPM = $(MISC)$/$(TARGET).rpmflag + .ENDIF # --- Targets ------------------------------------------------------- @@ -61,18 +61,22 @@ RPMDIR = $(shell cd $(BIN); pwd) .IF "$(RPM)"!="" -ALLTAR : PACKAGE_RPM +ALLTAR : $(PACKAGE_RPM) # --- packaging --------------------------------------------------- -.PHONY PACKAGE_RPM : $(MISC)/$(TARGET)-menus.spec +$(PACKAGE_RPM) : $(MISC)$/redhat.rpmflag + +$(PACKAGE_RPM) : $(MISC)/$(TARGET)-menus.spec + -@$(RM) $(PKGDIR)$/openoffice.org-$(TARGET)-*.noarch.rpm $(BIN)/noarch/openoffice.org-$(TARGET)-*.noarch.rpm @$(MKDIRHIER) $(MISC)$/$(TARGET) @$(MKDIRHIER) $(MISC)$/$(TARGET)$/BUILD - @$(RPM) --define "basedir $(shell pwd)" --define "unixfilename $(UNIXFILENAME)" \ + @$(RPM) $(RPMMACROS) -bb $< \ + --define "basedir $(PWD)" --define "unixfilename $(UNIXFILENAME)" \ --define "version $(PKGVERSION)" --define "release $(PKGREV)" \ - --define "_rpmdir $(RPMDIR)" -bb $< \ - --define "source $(shell cd $(MISC)$/redhat; pwd)" \ + --define "source $(ABSLOCALOUT)$/misc$/redhat" \ --define "unique $(shell echo $$$$)" \ - --define "_builddir $(shell cd $(MISC)$/$(TARGET)/BUILD; pwd)" + --define "_builddir $(ABSLOCALOUT)$/misc$/$(TARGET)/BUILD" + @touch $@ .ENDIF |