[ooo-build-commit] .: 3 commits - patches/dev300
René Engelhard
rene at kemper.freedesktop.org
Fri Jun 25 08:06:31 PDT 2010
patches/dev300/apply | 5 -
patches/dev300/buildfix-instsetoo_native-archive.diff | 68 ++++++++++++++++++
patches/dev300/buildfix-instsetoo_native-targets.diff | 68 ------------------
patches/dev300/gcc-HelpLinker.diff | 8 +-
4 files changed, 75 insertions(+), 74 deletions(-)
New commits:
commit 4f4feeae47953b623a4861e20aaa0425768bc73d
Author: Rene Engelhard <rene at debian.org>
Date: Fri Jun 25 17:04:12 2010 +0200
add "proper" patch for the .archive problem
* patches/dev300/apply: adapt
* patches/dev300/buildfix-instsetoo_native-archive.diff: .. here and update with
the masterfix which went into m84
* patches/dev300/buildfix-instsetoo_native-targets.diff: move ..
diff --git a/patches/dev300/apply b/patches/dev300/apply
index fdf4d32..af5a278 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -271,7 +271,7 @@ gcc-HelpLinker.diff # RENAMED transex3 -> l10ntools
[ TemporaryHacks < dev300-m84 ]
# add the .archive flag to some instsetoo_native/util/makefile.mk rules
-buildfix-instsetoo_native-targets.diff, i#111813, jholesov
+buildfix-instsetoo_native-archive.diff, i#111617
[ TemporaryHacks and not MacOSXOnly ]
diff --git a/patches/dev300/buildfix-instsetoo_native-archive.diff b/patches/dev300/buildfix-instsetoo_native-archive.diff
new file mode 100644
index 0000000..19a08b6
--- /dev/null
+++ b/patches/dev300/buildfix-instsetoo_native-archive.diff
@@ -0,0 +1,68 @@
+--- instsetoo_native/util/makefile.mk 2010-06-25 15:19:33.000000000 +0100
++++ instsetoo_native/util/makefile.mk 2010-06-25 15:36:17.000000000 +0100
+@@ -213,32 +213,32 @@ openoffice_%{$(PKGFORMAT:^".") .archive}
+ $(PERL) -w $(SOLARENV)$/bin$/gen_update_info.pl --buildid $(BUILD) --arch "$(RTL_ARCH)" --os "$(RTL_OS)" --lstfile $(PRJ)$/util$/openoffice.lst --product OpenOffice --languages $(subst,$(@:s/_/ /:1)_, $(@:b)) $(PRJ)$/util$/update.xml > $(MISC)/$(@:b)_$(RTL_OS)_$(RTL_ARCH)$(@:e).update.xml
+
+ $(foreach,i,$(alllangiso) openofficewithjre_$i) : $$@{$(PKGFORMAT:^".")}
+-openofficewithjre_%{$(PKGFORMAT:^".")} :
++openofficewithjre_%{$(PKGFORMAT:^".") .archive} :
+ $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p OpenOffice_wJRE -u $(OUT) -buildid $(BUILD) -msitemplate $(MSIOFFICETEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -format $(@:e:s/.//) $(VERBOSESWITCH)
+
+ $(foreach,i,$(alllangiso) openofficedev_$i) : $$@{$(PKGFORMAT:^".")}
+-openofficedev_%{$(PKGFORMAT:^".")} :
++openofficedev_%{$(PKGFORMAT:^".") .archive} :
+ $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p OpenOffice_Dev -u $(OUT) -buildid $(BUILD) -msitemplate $(MSIOFFICETEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -format $(@:e:s/.//) $(VERBOSESWITCH)
+ $(PERL) -w $(SOLARENV)$/bin$/gen_update_info.pl --buildid $(BUILD) --arch "$(RTL_ARCH)" --os "$(RTL_OS)" --lstfile $(PRJ)$/util$/openoffice.lst --product OpenOffice_Dev --languages $(subst,$(@:s/_/ /:1)_, $(@:b)) $(PRJ)$/util$/update.xml > $(MISC)/$(@:b)_$(RTL_OS)_$(RTL_ARCH)$(@:e).update.xml
+
+ $(foreach,i,$(alllangiso) ooolanguagepack_$i) : $$@{$(PKGFORMAT:^".")}
+-ooolanguagepack_%{$(PKGFORMAT:^".")} :
++ooolanguagepack_%{$(PKGFORMAT:^".") .archive} :
+ $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p OpenOffice -u $(OUT) -buildid $(BUILD) -msitemplate $(MSILANGPACKTEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -languagepack -format $(@:e:s/.//) $(VERBOSESWITCH)
+
+ $(foreach,i,$(alllangiso) ooodevlanguagepack_$i) : $$@{$(PKGFORMAT:^".")}
+-ooodevlanguagepack_%{$(PKGFORMAT:^".")} :
++ooodevlanguagepack_%{$(PKGFORMAT:^".") .archive} :
+ $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p OpenOffice_Dev -u $(OUT) -buildid $(BUILD) -msitemplate $(MSILANGPACKTEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -languagepack -format $(@:e:s/.//) $(VERBOSESWITCH)
+
+ $(foreach,i,$(alllangiso) sdkoo_$i) : $$@{$(PKGFORMAT:^".")}
+-sdkoo_%{$(PKGFORMAT:^".")} :
++sdkoo_%{$(PKGFORMAT:^".") .archive} :
+ $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p OpenOffice_SDK -u $(OUT) -buildid $(BUILD) -msitemplate $(MSISDKOOTEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -dontstrip -format $(@:e:s/.//) $(VERBOSESWITCH)
+
+ $(foreach,i,$(alllangiso) sdkoodev_$i) : $$@{$(PKGFORMAT:^".")}
+-sdkoodev_%{$(PKGFORMAT:^".")} :
++sdkoodev_%{$(PKGFORMAT:^".") .archive} :
+ $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p OpenOffice_Dev_SDK -u $(OUT) -buildid $(BUILD) -msitemplate $(MSISDKOOTEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -dontstrip -format $(@:e:s/.//) $(VERBOSESWITCH)
+
+ $(foreach,i,$(alllangiso) ure_$i) : $$@{$(PKGFORMAT:^".")}
+-ure_%{$(PKGFORMAT:^".")} :
++ure_%{$(PKGFORMAT:^".") .archive} :
+ .IF "$(OS)" == "MACOSX"
+ @echo 'for now, there is no standalone URE for Mac OS X'
+ .ELSE
+@@ -255,21 +255,21 @@ $(MAKETARGETS) : $$@{$(PKGFORMAT:^".")}
+ $(MAKETARGETS){$(PKGFORMAT:^".")} : $(ADDDEPS)
+ .ENDIF # "$(MAKETARGETS:e)"=="" && "$(MAKETARGETS:s/_//)"!="$(MAKETARGETS)"
+ .ENDIF # "$(MAKETARGETS)"!=""
+-broffice_%{$(PKGFORMAT:^".")} :
++broffice_%{$(PKGFORMAT:^".") .archive} :
+ +$(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p BrOffice -u $(OUT) -buildid $(BUILD) -msitemplate $(MSIOFFICETEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -format $(@:e:s/.//) $(VERBOSESWITCH)
+ $(PERL) -w $(SOLARENV)$/bin$/gen_update_info.pl --buildid $(BUILD) --arch "$(RTL_ARCH)" --os "$(RTL_OS)" --lstfile $(PRJ)$/util$/openoffice.lst --product BrOffice --languages $(subst,$(@:s/_/ /:1)_, $(@:b)) $(PRJ)$/util$/update.xml > $(MISC)/$(@:b)_$(RTL_OS)_$(RTL_ARCH)$(@:e).update.xml
+
+ $(foreach,i,$(alllangiso) brofficewithjre_$i) : $$@{$(PKGFORMAT:^".")}
+-brofficewithjre_%{$(PKGFORMAT:^".")} :
++brofficewithjre_%{$(PKGFORMAT:^".") .archive} :
+ +$(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p BrOffice_wJRE -u $(OUT) -buildid $(BUILD) -msitemplate $(MSIOFFICETEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -format $(@:e:s/.//) $(VERBOSESWITCH)
+
+ $(foreach,i,$(alllangiso) brofficedev_$i) : $$@{$(PKGFORMAT:^".")}
+-brofficedev_%{$(PKGFORMAT:^".")} :
++brofficedev_%{$(PKGFORMAT:^".") .archive} :
+ +$(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p BrOffice_Dev -u $(OUT) -buildid $(BUILD) -msitemplate $(MSIOFFICETEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -format $(@:e:s/.//) $(VERBOSESWITCH)
+ $(PERL) -w $(SOLARENV)$/bin$/gen_update_info.pl --buildid $(BUILD) --arch "$(RTL_ARCH)" --os "$(RTL_OS)" --lstfile $(PRJ)$/util$/openoffice.lst --product BrOffice_Dev --languages $(subst,$(@:s/_/ /:1)_, $(@:b)) $(PRJ)$/util$/update.xml > $(MISC)/$(@:b)_$(RTL_OS)_$(RTL_ARCH)$(@:e).update.xml
+
+ $(foreach,i,$(alllangiso) broolanguagepack_$i) : $$@{$(PKGFORMAT:^".")}
+-broolanguagepack_%{$(PKGFORMAT:^".")} :
++broolanguagepack_%{$(PKGFORMAT:^".") .archive} :
+ +$(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p BrOffice -u $(OUT) -buildid $(BUILD) -msitemplate $(MSILANGPACKTEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -languagepack -format $(@:e:s/.//) $(VERBOSESWITCH)
+
+ .ELSE # "$(alllangiso)"!=""
diff --git a/patches/dev300/buildfix-instsetoo_native-targets.diff b/patches/dev300/buildfix-instsetoo_native-targets.diff
deleted file mode 100644
index 19a08b6..0000000
--- a/patches/dev300/buildfix-instsetoo_native-targets.diff
+++ /dev/null
@@ -1,68 +0,0 @@
---- instsetoo_native/util/makefile.mk 2010-06-25 15:19:33.000000000 +0100
-+++ instsetoo_native/util/makefile.mk 2010-06-25 15:36:17.000000000 +0100
-@@ -213,32 +213,32 @@ openoffice_%{$(PKGFORMAT:^".") .archive}
- $(PERL) -w $(SOLARENV)$/bin$/gen_update_info.pl --buildid $(BUILD) --arch "$(RTL_ARCH)" --os "$(RTL_OS)" --lstfile $(PRJ)$/util$/openoffice.lst --product OpenOffice --languages $(subst,$(@:s/_/ /:1)_, $(@:b)) $(PRJ)$/util$/update.xml > $(MISC)/$(@:b)_$(RTL_OS)_$(RTL_ARCH)$(@:e).update.xml
-
- $(foreach,i,$(alllangiso) openofficewithjre_$i) : $$@{$(PKGFORMAT:^".")}
--openofficewithjre_%{$(PKGFORMAT:^".")} :
-+openofficewithjre_%{$(PKGFORMAT:^".") .archive} :
- $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p OpenOffice_wJRE -u $(OUT) -buildid $(BUILD) -msitemplate $(MSIOFFICETEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -format $(@:e:s/.//) $(VERBOSESWITCH)
-
- $(foreach,i,$(alllangiso) openofficedev_$i) : $$@{$(PKGFORMAT:^".")}
--openofficedev_%{$(PKGFORMAT:^".")} :
-+openofficedev_%{$(PKGFORMAT:^".") .archive} :
- $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p OpenOffice_Dev -u $(OUT) -buildid $(BUILD) -msitemplate $(MSIOFFICETEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -format $(@:e:s/.//) $(VERBOSESWITCH)
- $(PERL) -w $(SOLARENV)$/bin$/gen_update_info.pl --buildid $(BUILD) --arch "$(RTL_ARCH)" --os "$(RTL_OS)" --lstfile $(PRJ)$/util$/openoffice.lst --product OpenOffice_Dev --languages $(subst,$(@:s/_/ /:1)_, $(@:b)) $(PRJ)$/util$/update.xml > $(MISC)/$(@:b)_$(RTL_OS)_$(RTL_ARCH)$(@:e).update.xml
-
- $(foreach,i,$(alllangiso) ooolanguagepack_$i) : $$@{$(PKGFORMAT:^".")}
--ooolanguagepack_%{$(PKGFORMAT:^".")} :
-+ooolanguagepack_%{$(PKGFORMAT:^".") .archive} :
- $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p OpenOffice -u $(OUT) -buildid $(BUILD) -msitemplate $(MSILANGPACKTEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -languagepack -format $(@:e:s/.//) $(VERBOSESWITCH)
-
- $(foreach,i,$(alllangiso) ooodevlanguagepack_$i) : $$@{$(PKGFORMAT:^".")}
--ooodevlanguagepack_%{$(PKGFORMAT:^".")} :
-+ooodevlanguagepack_%{$(PKGFORMAT:^".") .archive} :
- $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p OpenOffice_Dev -u $(OUT) -buildid $(BUILD) -msitemplate $(MSILANGPACKTEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -languagepack -format $(@:e:s/.//) $(VERBOSESWITCH)
-
- $(foreach,i,$(alllangiso) sdkoo_$i) : $$@{$(PKGFORMAT:^".")}
--sdkoo_%{$(PKGFORMAT:^".")} :
-+sdkoo_%{$(PKGFORMAT:^".") .archive} :
- $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p OpenOffice_SDK -u $(OUT) -buildid $(BUILD) -msitemplate $(MSISDKOOTEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -dontstrip -format $(@:e:s/.//) $(VERBOSESWITCH)
-
- $(foreach,i,$(alllangiso) sdkoodev_$i) : $$@{$(PKGFORMAT:^".")}
--sdkoodev_%{$(PKGFORMAT:^".")} :
-+sdkoodev_%{$(PKGFORMAT:^".") .archive} :
- $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p OpenOffice_Dev_SDK -u $(OUT) -buildid $(BUILD) -msitemplate $(MSISDKOOTEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -dontstrip -format $(@:e:s/.//) $(VERBOSESWITCH)
-
- $(foreach,i,$(alllangiso) ure_$i) : $$@{$(PKGFORMAT:^".")}
--ure_%{$(PKGFORMAT:^".")} :
-+ure_%{$(PKGFORMAT:^".") .archive} :
- .IF "$(OS)" == "MACOSX"
- @echo 'for now, there is no standalone URE for Mac OS X'
- .ELSE
-@@ -255,21 +255,21 @@ $(MAKETARGETS) : $$@{$(PKGFORMAT:^".")}
- $(MAKETARGETS){$(PKGFORMAT:^".")} : $(ADDDEPS)
- .ENDIF # "$(MAKETARGETS:e)"=="" && "$(MAKETARGETS:s/_//)"!="$(MAKETARGETS)"
- .ENDIF # "$(MAKETARGETS)"!=""
--broffice_%{$(PKGFORMAT:^".")} :
-+broffice_%{$(PKGFORMAT:^".") .archive} :
- +$(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p BrOffice -u $(OUT) -buildid $(BUILD) -msitemplate $(MSIOFFICETEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -format $(@:e:s/.//) $(VERBOSESWITCH)
- $(PERL) -w $(SOLARENV)$/bin$/gen_update_info.pl --buildid $(BUILD) --arch "$(RTL_ARCH)" --os "$(RTL_OS)" --lstfile $(PRJ)$/util$/openoffice.lst --product BrOffice --languages $(subst,$(@:s/_/ /:1)_, $(@:b)) $(PRJ)$/util$/update.xml > $(MISC)/$(@:b)_$(RTL_OS)_$(RTL_ARCH)$(@:e).update.xml
-
- $(foreach,i,$(alllangiso) brofficewithjre_$i) : $$@{$(PKGFORMAT:^".")}
--brofficewithjre_%{$(PKGFORMAT:^".")} :
-+brofficewithjre_%{$(PKGFORMAT:^".") .archive} :
- +$(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p BrOffice_wJRE -u $(OUT) -buildid $(BUILD) -msitemplate $(MSIOFFICETEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -format $(@:e:s/.//) $(VERBOSESWITCH)
-
- $(foreach,i,$(alllangiso) brofficedev_$i) : $$@{$(PKGFORMAT:^".")}
--brofficedev_%{$(PKGFORMAT:^".")} :
-+brofficedev_%{$(PKGFORMAT:^".") .archive} :
- +$(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p BrOffice_Dev -u $(OUT) -buildid $(BUILD) -msitemplate $(MSIOFFICETEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -format $(@:e:s/.//) $(VERBOSESWITCH)
- $(PERL) -w $(SOLARENV)$/bin$/gen_update_info.pl --buildid $(BUILD) --arch "$(RTL_ARCH)" --os "$(RTL_OS)" --lstfile $(PRJ)$/util$/openoffice.lst --product BrOffice_Dev --languages $(subst,$(@:s/_/ /:1)_, $(@:b)) $(PRJ)$/util$/update.xml > $(MISC)/$(@:b)_$(RTL_OS)_$(RTL_ARCH)$(@:e).update.xml
-
- $(foreach,i,$(alllangiso) broolanguagepack_$i) : $$@{$(PKGFORMAT:^".")}
--broolanguagepack_%{$(PKGFORMAT:^".")} :
-+broolanguagepack_%{$(PKGFORMAT:^".") .archive} :
- +$(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p BrOffice -u $(OUT) -buildid $(BUILD) -msitemplate $(MSILANGPACKTEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -languagepack -format $(@:e:s/.//) $(VERBOSESWITCH)
-
- .ELSE # "$(alllangiso)"!=""
commit fedd8194b44d5237b6a79b8e86f2c52487e25aec
Author: Rene Engelhard <rene at debian.org>
Date: Fri Jun 25 17:00:03 2010 +0200
reenable gcc-HelpLinker.diff, buildfix-instsetoo_native-targets.diff is < m84
* patches/dev300/apply:
diff --git a/patches/dev300/apply b/patches/dev300/apply
index a9bc98c..fdf4d32 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -267,8 +267,9 @@ writerfilter-qnametostr-NOOPTFILES.diff
sc-cellsuno-avoid-early-destruction.diff, i#90076, pmladek
# don't let HelpLinker be miscompiled with g++ 4.3
-# FIXME dev300-m77 gcc-HelpLinker.diff # RENAMED transex3 -> l10ntools
+gcc-HelpLinker.diff # RENAMED transex3 -> l10ntools
+[ TemporaryHacks < dev300-m84 ]
# add the .archive flag to some instsetoo_native/util/makefile.mk rules
buildfix-instsetoo_native-targets.diff, i#111813, jholesov
commit 81d8609f07894146cd91a515592eb7c069b23d3f
Author: Rene Engelhard <rene at debian.org>
Date: Fri Jun 25 16:59:41 2010 +0200
make gcc-HelpLinker.diff apply
* patches/dev300/gcc-HelpLinker.diff:
diff --git a/patches/dev300/gcc-HelpLinker.diff b/patches/dev300/gcc-HelpLinker.diff
index fc91712..3266a6d 100644
--- a/patches/dev300/gcc-HelpLinker.diff
+++ b/patches/dev300/gcc-HelpLinker.diff
@@ -10,8 +10,8 @@ Subject: [PATCH 051/878] gcc-HelpLinker.diff
diff --git a/transex3/source/help/makefile.mk b/transex3/source/help/makefile.mk
index 3196d23..2841da2 100644
---- a/transex3/source/help/makefile.mk
-+++ b/transex3/source/help/makefile.mk
+--- l10ntools/source/help/makefile.mk
++++ l10ntools/source/help/makefile.mk
@@ -36,6 +36,7 @@ TARGETTYPE=CUI
.INCLUDE : settings.mk
@@ -22,8 +22,8 @@ index 3196d23..2841da2 100644
CFLAGS+= $(LIBXSLT_CFLAGS)
diff --git a/transex3/source/makefile.mk b/transex3/source/makefile.mk
index ab54779..e08e0ac 100644
---- a/transex3/source/makefile.mk
-+++ b/transex3/source/makefile.mk
+--- l10ntools/source/makefile.mk
++++ l10ntools/source/makefile.mk
@@ -39,6 +39,7 @@ ENABLE_EXCEPTIONS=TRUE
.INCLUDE : settings.mk
CDEFS+= -DYY_NEVER_INTERACTIVE=1
More information about the ooo-build-commit
mailing list