diff options
author | Jens-Heiner Rechtien <hr@openoffice.org> | 2005-09-28 14:24:53 +0000 |
---|---|---|
committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2005-09-28 14:24:53 +0000 |
commit | 39664b35bfc8cc2602c8fb87bc46acdd3b9808f0 (patch) | |
tree | 07dd8ac4c2f2a8e682b4d701eb8d9646da91d04a /readlicense_oo/util | |
parent | 925cfea56271bccd5db6ec3cf2a3aa5b152f3615 (diff) |
INTEGRATION: CWS cmcfixes19 (1.8.10); FILE MERGED
2005/09/22 15:41:07 cmc 1.8.10.1: #i54963# fix for parallel build
Diffstat (limited to 'readlicense_oo/util')
-rwxr-xr-x | readlicense_oo/util/makefile.pmk | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/readlicense_oo/util/makefile.pmk b/readlicense_oo/util/makefile.pmk index 4d59521458..3c66d15d7b 100755 --- a/readlicense_oo/util/makefile.pmk +++ b/readlicense_oo/util/makefile.pmk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.pmk,v $ # -# $Revision: 1.8 $ +# $Revision: 1.9 $ # -# last change: $Author: rt $ $Date: 2005-09-09 05:10:20 $ +# last change: $Author: hr $ $Date: 2005-09-28 15:24:53 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -72,17 +72,15 @@ $(MISC)$/readme%.html : .IF "$(XSLTPROC)"=="NO_XSLTPROC" $(JAVAI) $(JAVACPS) $(COMMON_BUILD_TOOLS)$/xt.jar$(PATH_SEPERATOR)$(COMMON_BUILD_TOOLS)$/parser.jar -Dcom.jclark.xsl.sax.parser=com.sun.xml.parser.Parser com.jclark.xsl.sax.Driver $(subst,_$(@:b:s/_/./:e:s/.//), $(COMMONMISC)$/$(TARGET)$/$(@:b).xrm) ..$/readme.xsl os1=$(OS) gui1=$(GUI) cp1=$(CPUNAME) com1=$(COM) lang1=$(@:b:s/_/./:e:s/.//) type=html file=$@ .ELSE - sed 's|xmlns:xt="http://www.jclark.com/xt"||;s|extension-element-prefixes="xt"||;s|.*xt:document.*||;s|<xsl:output method = "HTML" doctype-public = "-//W3C//DTD HTML 3.2//EN" />|<xsl:output method="html" doctype-public="-//W3C//DTD HTML 3.2//EN" />|' < ..$/readme.xsl > ..$/readme2.xsl - xsltproc -o $@ \ + sed 's|xmlns:xt="http://www.jclark.com/xt"||;s|extension-element-prefixes="xt"||;s|.*xt:document.*||;s|<xsl:output method = "HTML" doctype-public = "-//W3C//DTD HTML 3.2//EN" />|<xsl:output method="html" doctype-public="-//W3C//DTD HTML 3.2//EN" />|' < ..$/readme.xsl | xsltproc -o $@ \ --stringparam os1 $(OS) \ --stringparam gui1 $(GUI) \ --stringparam cp1 $(CPUNAME) \ --stringparam com1 $(COM) \ --stringparam lang1 $(@:b:s/_/./:e:s/.//) \ --stringparam type html \ - ..$/readme2.xsl \ + - \ $(subst,_$(@:b:s/_/./:e:s/.//), $(COMMONMISC)$/$(TARGET)$/$(@:b).xrm) - rm ..$/readme2.xsl .ENDIF $(MISC)$/readme%.txt : @@ -90,16 +88,14 @@ $(MISC)$/readme%.txt : .IF "$(XSLTPROC)"=="NO_XSLTPROC" $(JAVAI) $(JAVACPS) $(COMMON_BUILD_TOOLS)$/xt.jar$(PATH_SEPERATOR)$(COMMON_BUILD_TOOLS)$/parser.jar -Dcom.jclark.xsl.sax.parser=com.sun.xml.parser.Parser com.jclark.xsl.sax.Driver $(subst,_$(@:b:s/_/./:e:s/.//), $(COMMONMISC)$/$(TARGET)$/$(@:b).xrm) ..$/readme.xsl os1=$(OS) gui1=$(GUI) cp1=$(CPUNAME) com1=$(COM) lang1=$(@:b:s/_/./:e:s/.//) type=text file=$@ .ELSE - sed 's|xmlns:xt="http://www.jclark.com/xt"||;s|extension-element-prefixes="xt"||;s|.*xt:document.*||;s|<xsl:output method = "HTML" doctype-public = "-//W3C//DTD HTML 3.2//EN" />|<xsl:output method="text" />|' < ..$/readme.xsl > ..$/readme2.xsl - xsltproc -o $@ \ + sed 's|xmlns:xt="http://www.jclark.com/xt"||;s|extension-element-prefixes="xt"||;s|.*xt:document.*||;s|<xsl:output method = "HTML" doctype-public = "-//W3C//DTD HTML 3.2//EN" />|<xsl:output method="text" />|' < ..$/readme.xsl | xsltproc -o $@ \ --stringparam os1 $(OS) \ --stringparam gui1 $(GUI) \ --stringparam cp1 $(CPUNAME) \ --stringparam com1 $(COM) \ --stringparam lang1 $(@:b:s/_/./:e:s/.//) \ --stringparam type text \ - ..$/readme2.xsl \ + - \ $(subst,_$(@:b:s/_/./:e:s/.//), $(COMMONMISC)$/$(TARGET)$/$(@:b).xrm) - rm ..$/readme2.xsl .ENDIF |