[ooo-build-commit] patches/dev300

[Thorsten Behrens]

 patches/dev300/apply                      |    2 ++
 patches/dev300/readlicense-build-fix.diff |   13 +++++++++++++
 2 files changed, 15 insertions(+)

New commits:
commit acac61918f3c97ff9dc7ef35a4dd914c9c132eec
Author: Thorsten Behrens <thb at openoffice.org>
Date:   Fri Sep 4 10:34:08 2009 +0200

    Make readlicense project build
    
    * patches/dev300/apply: added below patch
    * patches/dev300/readlicense-build-fix.diff: avoid dupe targets
      under various WITH_LANG settings. Dunno why this is in, does the
      right thing (tm) now for me, at any rate.

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 3627073..3ff06ba 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -983,6 +983,8 @@ postset-add-ro.diff
 # [which is a broken setup, but apparently most apps don't break with that ;-)] 
 dmake-space-in-envvar-name.diff, i#101786, jholesov
 
+# make readlicense build again with various WITH_LANG settings
+readlicense-build-fix.diff, thorsten
 
 [ Java14 ]
 
diff --git a/patches/dev300/readlicense-build-fix.diff b/patches/dev300/readlicense-build-fix.diff
new file mode 100644
index 0000000..f55a67c
--- /dev/null
+++ b/patches/dev300/readlicense-build-fix.diff
@@ -0,0 +1,13 @@
+--- readlicense_oo/util/makefile.pmk~	2009-08-11 03:54:57.000000000 +0200
++++ readlicense_oo/util/makefile.pmk	2009-09-04 10:25:43.000000000 +0200
+@@ -38,9 +38,7 @@
+ SYSHTMLDOCS=$(SYSTEXTDOCS:s/.txt/.html/)
+ .ENDIF		# "$(GUI)"=="UNX"
+ 
+-.IF "$(WITH_LANG)"!=""
+-MERGEDXRM=$(COMMONMISC)$/$(TARGET)$/readme.xrm
+-.ELSE		# "$(WITH_LANG)"!=""
++.IF "$(WITH_LANG)"==""
+ MERGEDXRM=.$/readme.xrm
+ .ENDIF		# "$(WITH_LANG)"!=""
+