diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2006-01-13 13:56:56 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2006-01-13 13:56:56 +0000 |
| commit | 2a43cf078a054c1e6a21ccfa9f0605e646e394b5 (patch) | |
| tree | 3ac25ae3280c005c31c00c158e7ed1f36c58c503 /sysui/desktop | |
| parent | d36b9f6419fea1cf8593e652f59c273c4c8a4184 (diff) | |
INTEGRATION: CWS sysui12 (1.7.10); FILE MERGED
2005/12/19 14:12:19 obr 1.7.10.4: RESYNC: (1.8-1.9); FILE MERGED
2005/11/07 10:25:01 obr 1.7.10.3: RESYNC: (1.7-1.8); FILE MERGED
2005/10/26 11:52:51 obr 1.7.10.2: #i46964# made packages non phony targets
2005/10/06 10:00:17 obr 1.7.10.1: #i46964# deliver desktop integration packages in version independant tgz
Diffstat (limited to 'sysui/desktop')
| -rw-r--r-- | sysui/desktop/debian/makefile.mk | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/sysui/desktop/debian/makefile.mk b/sysui/desktop/debian/makefile.mk index 40df115bcdf1..0b93b779b059 100644 --- a/sysui/desktop/debian/makefile.mk +++ b/sysui/desktop/debian/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.9 $ +# $Revision: 1.10 $ # -# last change: $Author: rt $ $Date: 2005-12-14 09:41:40 $ +# last change: $Author: rt $ $Date: 2006-01-13 14:56:56 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -131,7 +131,7 @@ KDEICONLIST = \ .IF "$(DPKG)"!="" PKGNAME=openoffice.org-$(TARGET)-menus -DEBFILE=$(BIN)/$(PKGNAME)_$(PKGVERSION)-$(PKGREV)_all.deb +DEBFILE=$(PKGDIR)/$(PKGNAME)_$(PKGVERSION)-$(PKGREV)_all.deb DEBDEPN = \ $(MISC)/$(TARGET)/$(DEBFILE:f)/etc/$(UNIXFILENAME) \ $(MISC)/$(TARGET)/$(DEBFILE:f)/usr/bin/soffice \ @@ -248,8 +248,10 @@ $(MISC)/$(TARGET)/$(DEBFILE:f)/etc/$(UNIXFILENAME) : # --- packaging --------------------------------------------------- # getuid.so fakes the user/group for us -.PHONY $(DEBFILE) : $(DEBDEPN) - @$(MKDIRHIER) $(MISC)/$(TARGET)/$(DEBFILE:f)/DEBIAN +$(DEBFILE) : $(DEBDEPN) control postinst postrm prerm + -@$(RM) $(@:d)/$(PKGNAME)_*_all.deb $(BIN)$/$(PKGNAME)_*_all.deb + @$(MKDIRHIER) $(@:d) + @$(MKDIRHIER) $(MISC)/$(TARGET)/$(@:f)/DEBIAN @cat control | tr -d "\015" > $(MISC)/$(TARGET)/$(DEBFILE:f)/DEBIAN/control @echo "Version: $(PKGVERSION)-$(PKGREV)" >> $(MISC)/$(TARGET)/$(DEBFILE:f)/DEBIAN/control @du -k -s $(MISC)/$(TARGET)/$(DEBFILE:f) | awk -F ' ' '{ printf "Installed-Size: %s\n", $$1 ; }' >> $(MISC)/$(TARGET)/$(DEBFILE:f)/DEBIAN/control @@ -259,6 +261,6 @@ $(MISC)/$(TARGET)/$(DEBFILE:f)/etc/$(UNIXFILENAME) : @chmod -R g-w $(MISC)/$(TARGET)/$(DEBFILE:f) @chmod a+rx $(MISC)/$(TARGET)/$(DEBFILE:f)/DEBIAN $(MISC)/$(TARGET)/$(DEBFILE:f)/DEBIAN/post* $(MISC)/$(TARGET)/$(DEBFILE:f)/DEBIAN/pre* /bin/bash -c "LD_PRELOAD=$(SOLARBINDIR)/getuid.so dpkg-deb --build $(MISC)/$(TARGET)/$(@:f) $@" - @$(RM) -r $(MISC)/$(TARGET)/$(@:f) + @$(RM) -r $(MISC)/$(TARGET)/$(@:f)/DEBIAN .ENDIF |