summaryrefslogtreecommitdiff
path: root/sysui
diff options
context:
space:
mode:
authorJens-Heiner Rechtien <hr@openoffice.org>2006-04-19 14:27:14 +0000
committerJens-Heiner Rechtien <hr@openoffice.org>2006-04-19 14:27:14 +0000
commitb47bbde4eaa9a0dc2b6018afacafe256b764829f (patch)
tree805a1a33d1081381ab069eeb797e8bcb3cee689c /sysui
parenta1e70a7bb503ab15fb654638dd157a14b51f5b42 (diff)
INTEGRATION: CWS systemint01 (1.11.2); FILE MERGED
2006/03/20 17:04:21 ihi 1.11.2.3: clean up 2006/03/17 16:00:08 ihi 1.11.2.2: #i62340# creation of rpm more robust 2006/03/10 18:11:15 ihi 1.11.2.1: #i59509# permission fixed
Diffstat (limited to 'sysui')
-rw-r--r--sysui/desktop/debian/makefile.mk8
1 files changed, 5 insertions, 3 deletions
diff --git a/sysui/desktop/debian/makefile.mk b/sysui/desktop/debian/makefile.mk
index 47e61b6c7d0c..31def48b7018 100644
--- a/sysui/desktop/debian/makefile.mk
+++ b/sysui/desktop/debian/makefile.mk
@@ -4,9 +4,9 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.11 $
+# $Revision: 1.12 $
#
-# last change: $Author: kz $ $Date: 2006-01-31 18:19:18 $
+# last change: $Author: hr $ $Date: 2006-04-19 15:27:14 $
#
# The Contents of this file are made available subject to
# the terms of GNU Lesser General Public License Version 2.1.
@@ -260,7 +260,9 @@ $(DEBFILE) : $(DEBDEPN) control postinst postrm prerm
@cat prerm | tr -d "\015" | sed -e "s/%PREFIX/$(UNIXFILENAME)/g" > $(MISC)/$(TARGET)/$(DEBFILE:f)/DEBIAN/prerm
@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) $@"
+ @chmod g-s $(MISC)/$(TARGET)/$(DEBFILE:f)/DEBIAN
+ /bin/bash -c "LD_PRELOAD=$(SOLARBINDIR)/getuid.so dpkg-deb --build $(MISC)/$(TARGET)/$(@:f) $@" && $(TOUCH) $(MISC)$/$(TARGET).debflag
+ +$(TYPE) $(MISC)$/$(TARGET).debflag || echo "ERROR: packing $(TARGET) failed! "
@$(RM) -r $(MISC)/$(TARGET)/$(@:f)/DEBIAN
.ENDIF