diff options
| author | Oliver Bolte <obo@openoffice.org> | 2007-01-22 13:33:31 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2007-01-22 13:33:31 +0000 |
| commit | 9509bf1075349d968241266c6d3d0111f7aaf77c (patch) | |
| tree | bd6a05c39ee19db6bf581cf15becc68d419e8e36 /sysui/desktop | |
| parent | 7f5c612de70e8f0ee05ce94d800bef688fe3a76b (diff) | |
INTEGRATION: CWS native76 (1.14.10); FILE MERGED
2007/01/15 09:42:03 obr 1.14.10.1: #144467# copyright file for desktop integration package
Diffstat (limited to 'sysui/desktop')
| -rw-r--r-- | sysui/desktop/solaris/makefile.mk | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/sysui/desktop/solaris/makefile.mk b/sysui/desktop/solaris/makefile.mk index 714ba43a8a40..85e4127561f4 100644 --- a/sysui/desktop/solaris/makefile.mk +++ b/sysui/desktop/solaris/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.14 $ +# $Revision: 1.15 $ # -# last change: $Author: ihi $ $Date: 2006-12-19 11:29:01 $ +# last change: $Author: obo $ $Date: 2007-01-22 14:33:31 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -91,6 +91,7 @@ PKGDEPN = \ $(MISC)/$(TARGET)/mailcap \ $(MISC)/$(TARGET)/postinstall \ $(MISC)/$(TARGET)/prototype \ + $(MISC)/$(TARGET)/copyright \ $(MISC)/$(TARGET)/checkinstall PKGDIR = $(shell cd $(BIN); pwd) @@ -175,8 +176,8 @@ $(MISC)/$(TARGET)/{space postinstall mailcap} : $$(@:f) ../productversion.mk # --- checkinstall ----------------------------------------------- -# Copy the checkinstall file to $(MISC) -$(MISC)/$(TARGET)/checkinstall : $$(@:f) +# Copy the checkinstall and copyright file to $(MISC) +$(MISC)/$(TARGET)/{checkinstall copyright} : $$(@:f) @$(MKDIRHIER) $(@:d) @cat $(@:f) | tr -d "\015" > $@ @@ -189,7 +190,7 @@ $(MISC)/$(TARGET)/{openoffice.sh printeradmin.sh} : ../share/$$(@:f) # --- packaging --------------------------------------------------- -$(PKGFILE) : $(PKGDEPN) makefile.mk +$(PKGFILE) : $(PKGDEPN) copyright makefile.mk @-$(RM) $(BIN)$/$(PKGNAME).tar.gz @$(MKDIRHIER) $(@:d) @pkgmk -r . -f $(MISC)/$(TARGET)/prototype -o -d $(BIN) ARCH=$(PKGARCH) VERSION=$(PKGVERSION),REV=$(PKGREV).$(PKGDATESTRING) |