diff options
| author | Vladimir Glazunov <vg@openoffice.org> | 2009-12-11 17:56:47 +0100 |
|---|---|---|
| committer | Vladimir Glazunov <vg@openoffice.org> | 2009-12-11 17:56:47 +0100 |
| commit | 2d70857a265764150d701865f648fff4b6951c39 (patch) | |
| tree | f9ce4554eb19b9e385c6b17eba3e52fca3356ff0 | |
| parent | d0b5de584e85bd520d2cff1c9c328801596d5386 (diff) | |
| parent | 16c6a8f775bb1db96f303d83b7c808ef87676a43 (diff) | |
CWS-TOOLING: integrate CWS fwk129_DEV300
| -rw-r--r-- | filter/source/config/fragments/makefile.mk | 4 | ||||
| -rwxr-xr-x | filter/source/config/tools/merge/pyAltFCFGMerge | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/filter/source/config/fragments/makefile.mk b/filter/source/config/fragments/makefile.mk index d398e03e5a7d..6503062bc654 100644 --- a/filter/source/config/fragments/makefile.mk +++ b/filter/source/config/fragments/makefile.mk @@ -185,8 +185,12 @@ $(ALL_FLAGS) : $(INCLUDE_FRAGMENTS) .IF "$(SOLAR_JAVA)"=="" #cmc, hack to workaround the java build requirement +.IF "$(SYSTEM_PYTHON)" == "YES" MERGE:=python ../tools/merge/pyAltFCFGMerge .ELSE +MERGE:=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/python ../tools/merge/pyAltFCFGMerge +.ENDIF +.ELSE MERGE := $(JAVAI) -jar $(SOLARBINDIR)$/FCFGMerge.jar .ENDIF diff --git a/filter/source/config/tools/merge/pyAltFCFGMerge b/filter/source/config/tools/merge/pyAltFCFGMerge index b143caabcd6b..17fe16fb3445 100755 --- a/filter/source/config/tools/merge/pyAltFCFGMerge +++ b/filter/source/config/tools/merge/pyAltFCFGMerge @@ -11,7 +11,7 @@ import sys, string, os.path -CFGFILE = "../tools/merge/FCFGMerge.cfg" +CFGFILE = "../../../../transex3/source/filter/merge/FCFGMerge.cfg" PROP_XMLVERSION = "xmlversion" # // <= global cfg file PROP_XMLENCODING = "xmlencoding" # // <= global cfg file |