summaryrefslogtreecommitdiff
path: root/sysui/desktop/util
diff options
context:
space:
mode:
authorRĂ¼diger Timm <rt@openoffice.org>2006-01-13 13:58:26 +0000
committerRĂ¼diger Timm <rt@openoffice.org>2006-01-13 13:58:26 +0000
commit0f4af4670dac0a5758561d6ada959d7406866867 (patch)
tree89d629b1465bc0794bd69137b4d98a70ddf5f937 /sysui/desktop/util
parent12ebcfe90d9d6c2e77acbeb19fe5ade3a9a7be68 (diff)
INTEGRATION: CWS sysui12 (1.9.8); FILE MERGED
2006/01/09 10:06:46 obr 1.9.8.2: RESYNC: (1.9-1.10); FILE MERGED 2005/10/06 10:00:44 obr 1.9.8.1: #i46964# deliver desktop integration packages in version independant tgz
Diffstat (limited to 'sysui/desktop/util')
-rw-r--r--sysui/desktop/util/makefile.mk30
1 files changed, 27 insertions, 3 deletions
diff --git a/sysui/desktop/util/makefile.mk b/sysui/desktop/util/makefile.mk
index 2269144b0aed..a64e3f598914 100644
--- a/sysui/desktop/util/makefile.mk
+++ b/sysui/desktop/util/makefile.mk
@@ -4,9 +4,9 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.10 $
+# $Revision: 1.11 $
#
-# last change: $Author: hr $ $Date: 2005-12-28 16:54:58 $
+# last change: $Author: rt $ $Date: 2006-01-13 14:58:26 $
#
# The Contents of this file are made available subject to
# the terms of GNU Lesser General Public License Version 2.1.
@@ -46,6 +46,8 @@ LIBSALCPPRT=$(0)
# --- Settings -----------------------------------------------------
.INCLUDE : settings.mk
+.INCLUDE : packtools.mk
+.INCLUDE : ..$/productversion.mk
.IF "$(ENABLE_GNOMEVFS)"!=""
COMPILER_WARN_ALL=TRUE
@@ -79,6 +81,13 @@ PKGCONFIG_LIBS!:=-Wl,--export-dynamic $(PKGCONFIG_LIBS)
.ENDIF # "$(ENABLE_GNOMEVFS)"!=""
+.IF "$(OS)"!="SOLARIS"
+TARFILE=$(BIN)$/rpm$/openoffice.org-desktop-integration.tar.gz
+.IF "$(DPKG)" != ""
+TARFILE2=$(BIN)$/deb$/openoffice.org-desktop-integration.tar.gz
+.ENDIF # "$(DPKG)" != ""
+.ENDIF # "$(OS)"!="SOLARIS"
+
# --- Files --------------------------------------------------------
.IF "$(ENABLE_GNOMEVFS)"!=""
@@ -97,9 +106,24 @@ SCRIPTS= \
.INCLUDE : target.mk
-ALLTAR: $(SCRIPTS)
+ALLTAR: $(SCRIPTS) $(TARFILE) $(TARFILE2)
$(SCRIPTS) : $$(@:f)
+@rm -f $@ 2>/dev/null
+@cat $(@:f) | tr -d "\015" > $@
+@chmod 555 $@
+
+.IF "$(OS)"!="SOLARIS"
+
+$(TARFILE) : $(PKGDIR)$/{$(shell ls $(PKGDIR))}
+ $(MKDIRHIER) $(@:d)
+ tar -C $(PKGDIR:d:d) -cf - $(PKGDIR:f)/ | gzip > $@
+.ENDIF
+
+.IF "$(DPKG)" != ""
+
+$(TARFILE2) : $(shell ls $(PKGDIR)$/*.deb)
+ $(MKDIRHIER) $(@:d)
+ tar -C $(PKGDIR) -cf - {$(<:f)} | gzip > $@
+
+.ENDIF # IF "$(DPKG)" != ""