From 02489cb4b5dff93e02ee3c46109152fc9243f2f9 Mon Sep 17 00:00:00 2001
From: Rüdiger Timm <rt@openoffice.org>
Date: Tue, 2 Sep 2008 10:55:45 +0000
Subject: INTEGRATION: CWS sysui30_DEV300 (1.22.28); FILE MERGED 2008/09/01
 14:11:27 ihi 1.22.28.2: #i92874# yet another fix 2008/08/28 14:18:59 ihi
 1.22.28.1: #i92874# 3-layer-office fix

---
 sysui/desktop/solaris/makefile.mk | 32 +++++++++++++++++++++++++++++---
 1 file changed, 29 insertions(+), 3 deletions(-)

(limited to 'sysui/desktop/solaris')

diff --git a/sysui/desktop/solaris/makefile.mk b/sysui/desktop/solaris/makefile.mk
index 89c175e2a0c7..645ad84b1562 100644
--- a/sysui/desktop/solaris/makefile.mk
+++ b/sysui/desktop/solaris/makefile.mk
@@ -8,7 +8,7 @@
 #
 # $RCSfile: makefile.mk,v $
 #
-# $Revision: 1.22 $
+# $Revision: 1.23 $
 #
 # This file is part of OpenOffice.org.
 #
@@ -84,6 +84,31 @@ $(MISC)/{$(PRODUCTLIST)}/copyright : $$(@:f)
     @$(MKDIRHIER) $(@:d)
     @cat $(@:f) | tr -d "\015" > $@
 
+# --- postinstall--------------------------------
+
+
+# Copy the postinstall file to $(MISC) 
+$(MISC)/{$(PRODUCTLIST)}/postinstall : $$(@:f)
+    @$(MKDIRHIER) $(@:d)
+    @cat $(@:f) | tr -d "\015" > $@
+
+# --- postremove--------------------------------
+
+# Copy the postremove file to $(MISC) 
+$(MISC)/{$(PRODUCTLIST)}/postremove : $$(@:f)
+    @$(MKDIRHIER) $(@:d)
+    @cat $(@:f) | tr -d "\015" > $@
+
+# --- openoffice.xml---------------------------
+
+# Copy the openoffice.org.xml file to $(MISC) 
+#$(MISC)/$(foreach,i,$(PRODUCTLIST) $i/$i.xml) :  $(COMMONMISC)/$$(@:b)/openoffice.org.xml
+$(MISC)/$(foreach,i,$(PRODUCTLIST) $(MISC)/$i/openoffice.org.xml) :  $(COMMONMISC)/$$(@:b)/openoffice.org.xml
+    $(MKDIRHIER) $(@:d)
+    echo hier hier $@
+    cat $< | tr -d "\015" > $@
+
+
 # --- prototype ---------------------------------------------------
 
 # Copy the prototype file to $(MISC)
@@ -93,11 +118,12 @@ $(MISC)/{$(PRODUCTLIST)}$/prototype : $$(@:f) ../productversion.mk makefile.mk
 
 # --- packaging ---------------------------------------------------
 
-$(PKGFILES) : $(MISC)/{$(PRODUCTLIST)}/{copyright pkginfo depend mailcap} makefile.mk
+#$(PKGFILES) : $(MISC)/{$(PRODUCTLIST)}/{copyright pkginfo depend mailcap postinstall postremove} makefile.mk $(MISC)/$$(@:b:b:s/-desktop-integration//)/$$(@:b:b:s/-desktop-integration//).xml
+$(PKGFILES) : $(MISC)/{$(PRODUCTLIST)}/{copyright pkginfo depend mailcap postinstall postremove} makefile.mk $(MISC)/$$(@:b:b:s/-desktop-integration//)/openoffice.org.xml
 $(PKGFILES) : $(MISC)$/{$(PRODUCTLIST)}$/prototype
     @-$(RM) $(BIN)$/$(@:f)
     @$(MKDIRHIER) $(@:d)
-    pkgmk -r . -f $(MISC)$/$(@:b:b:s/-/ /:1)$/prototype -o -d $(PKGDIR) ARCH=$(PKGARCH) VERSION=$(PKGVERSION.$(@:b:s/-/ /:1)),REV=$(PKGREV).$(PKGDATESTRING)
+    pkgmk -r . -f $(MISC)$/$(@:b:b:s/-/ /:1)$/prototype -o -d $(PKGDIR) ARCH=$(PKGARCH) VERSION=$(PKGVERSION.$(@:b:s/-/ /:1)),REV=$(PKGREV).$(PKGDATESTRING) 
     $(FASPAC) $(SOLARBINDIR)/faspac-so.sh -a -d $(PKGDIR) $(@:b:b:s/-/ /:1:s/.//)30-desktop-int
     @tar -cf - -C $(PKGDIR) $(@:b:b:s/-/ /:1:s/.//)30-desktop-int | gzip > $@
     @rm -rf $(PKGDIR)/$(@:b:b:s/-/ /:1:s/.//)-desktop-int30
-- 
cgit