diff options
| author | Kurt Zenker <kz@openoffice.org> | 2008-05-06 09:33:04 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2008-05-06 09:33:04 +0000 |
| commit | 8c90eb3c1751ac45e886f94ccf1c796007de42be (patch) | |
| tree | 328214f8e67574c1637ccb4c76371f05f6f9fc2d /sysui/desktop/solaris | |
| parent | 78a06a7cf639df28bdd1daa851e92e1ec9aabe9c (diff) | |
INTEGRATION: CWS native147 (1.21.6); FILE MERGED
2008/04/23 21:08:52 obr 1.21.6.2: removed CDE integration as CDE in Solaris has been EOLed
2008/04/23 20:26:47 obr 1.21.6.1: #i88334#,#i61569#,#i62176# removed /etc indirection and package database check for office install location
Diffstat (limited to 'sysui/desktop/solaris')
| -rw-r--r-- | sysui/desktop/solaris/makefile.mk | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/sysui/desktop/solaris/makefile.mk b/sysui/desktop/solaris/makefile.mk index 69632a0b4064..89c175e2a0c7 100644 --- a/sysui/desktop/solaris/makefile.mk +++ b/sysui/desktop/solaris/makefile.mk @@ -8,7 +8,7 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.21 $ +# $Revision: 1.22 $ # # This file is part of OpenOffice.org. # @@ -70,31 +70,30 @@ $(MISC)/{$(PRODUCTLIST)}/{pkginfo depend} : $$(@:f) ../productversion.mk makefil @$(MKDIRHIER) $(@:d) @cat $(@:f) | tr -d "\015" | sed -e "s/%PRODUCTNAME/$(PRODUCTNAME.$(@:d:d:f)) $(PRODUCTVERSION.$(@:d:d:f))/g" -e "s/%pkgprefix/$(@:d:d:f:s/.//)/" > $@ -# --- space, postinstall & mailcap --------------------------------- +# --- mailcap --------------------------------- # Copy the prototype file to $(MISC) -$(MISC)/{$(PRODUCTLIST)}/{space postinstall checkinstall mailcap} : $$(@:f) ../productversion.mk +$(MISC)/{$(PRODUCTLIST)}/mailcap : $$(@:f) ../productversion.mk @$(MKDIRHIER) $(@:d) @cat $(@:f) | tr -d "\015" | sed -e "s/%PREFIX/$(UNIXFILENAME.$(@:d:d:f))/g" -e "s_%SOURCE_$(MISC)/$(@:d:d:f)_g" > $@ -# --- checkinstall & copyright-------------------------------- +# --- copyright-------------------------------- -# Copy the checkinstall and copyright file to $(MISC) -$(MISC)/{$(PRODUCTLIST)}/{copyright} : $$(@:f) +# Copy the copyright file to $(MISC) +$(MISC)/{$(PRODUCTLIST)}/copyright : $$(@:f) @$(MKDIRHIER) $(@:d) @cat $(@:f) | tr -d "\015" > $@ # --- prototype --------------------------------------------------- # Copy the prototype file to $(MISC) -$(MISC)/{$(PRODUCTLIST)}$/prototype : $$(@:f) ../productversion.mk $(COMMONMISC)$/$$(@:d:d:f)$/cdelauncherlist makefile.mk +$(MISC)/{$(PRODUCTLIST)}$/prototype : $$(@:f) ../productversion.mk makefile.mk @$(MKDIRHIER) $(@:d) cat $(@:f) | tr -d "\015" | sed -e "s/%PREFIX/$(UNIXFILENAME.$(@:d:d:f))/g" -e "s_%SOURCE_$(COMMONMISC)/$(@:d:d:f)_g" -e "s/%ICONPREFIX/$(ICONPREFIX.$(@:d:d:f))/g" > $@ - pkgproto $(COMMONMISC)$/$(@:d:d:f)/types=usr/dt/appconfig/types | awk '{ printf "%s %s %s 0%d%d root bin\n",$$1, $$2, $$3, $$4/100, $$4%10*11 }' >> $@ # --- packaging --------------------------------------------------- -$(PKGFILES) : $(MISC)/{$(PRODUCTLIST)}/{checkinstall copyright space pkginfo depend postinstall mailcap} makefile.mk +$(PKGFILES) : $(MISC)/{$(PRODUCTLIST)}/{copyright pkginfo depend mailcap} makefile.mk $(PKGFILES) : $(MISC)$/{$(PRODUCTLIST)}$/prototype @-$(RM) $(BIN)$/$(@:f) @$(MKDIRHIER) $(@:d) |