diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2011-11-10 13:34:33 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2011-11-10 13:36:20 +0100 |
| commit | c1bd2a254b4a22a02d515b084dabafe963f175ff (patch) | |
| tree | 775c3a011465fa4884639d1630b99a010da55458 /i18npool | |
| parent | 32e173b865619ff7b8a55ef49dab0cb15496b174 (diff) | |
New LO_{LIB,JAVA}_DIR make special inbuild component handling superfluous.
Diffstat (limited to 'i18npool')
| -rwxr-xr-x | i18npool/source/localedata/Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/i18npool/source/localedata/Makefile b/i18npool/source/localedata/Makefile index 51c6c3af6df2..b1fa0a917da7 100755 --- a/i18npool/source/localedata/Makefile +++ b/i18npool/source/localedata/Makefile @@ -31,7 +31,7 @@ all : $(patsubst %.xml,localedata_%.cxx,$(notdir $(wildcard $(SRC_ROOT)/i18npool include $(GBUILDDIR)/gbuild_simple.mk my_file := file://$(if $(filter $(OS_FOR_BUILD),WNT),/) -my_components := component/sax/source/expatwrap/expwrap.inbuild.component +my_components := component/sax/source/expatwrap/expwrap.component localedata_%.cxx : localedata_%_invis.cxx sed 's/\(^.*get[^;]*$$\)/SAL_DLLPUBLIC_EXPORT \1/' $< > $@ @@ -40,11 +40,11 @@ localedata_%_invis.cxx : $(realpath $(SRC_ROOT)/i18npool/source/localedata/data) ifeq ($(OS_FOR_BUILD),WNT) $(gb_Helper_execute)saxparser $* `cygpath -m $<` $@ \ $(my_file)`cygpath -m $(WORKDIR)/CustomTarget/i18npool/source/localedata/saxparser.rdb` `cygpath -m $(OUTDIR)/bin/types.rdb` \ - -env:OOO_INBUILD_SHAREDLIB_DIR=$(my_file)`cygpath -m $(OUTDIR)/bin` + -env:LO_LIB_DIR=$(my_file)`cygpath -m $(OUTDIR)/bin` else $(gb_Helper_execute)saxparser $* $< $@ \ $(my_file)$(WORKDIR_FOR_BUILD)/CustomTarget/i18npool/source/localedata/saxparser.rdb $(OUTDIR_FOR_BUILD)/bin/types.rdb \ - -env:OOO_INBUILD_SHAREDLIB_DIR=$(my_file)$(OUTDIR_FOR_BUILD)/lib + -env:LO_LIB_DIR=$(my_file)$(OUTDIR_FOR_BUILD)/lib endif saxparser.rdb : saxparser.input |