diff options
| author | Hans-Joachim Lankenau <hjs@openoffice.org> | 2010-05-31 19:26:13 +0200 |
|---|---|---|
| committer | Hans-Joachim Lankenau <hjs@openoffice.org> | 2010-05-31 19:26:13 +0200 |
| commit | 5b4fd6574fc2b3ce79e62c65ff4f54732626ed2e (patch) | |
| tree | 54579ceadd6b2152386f27a79300eecbef5dafc0 /soltools | |
| parent | a0de0def4a49a63c6675a622123b793da8b4c78d (diff) | |
ause120: #i110479# - applied patch: temporary kick stlport include path out of SOLARINC
Diffstat (limited to 'soltools')
| -rwxr-xr-x[-rw-r--r--] | soltools/util/makefile.pmk | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/soltools/util/makefile.pmk b/soltools/util/makefile.pmk index 33c04cf547eb..bf51cf851b4c 100644..100755 --- a/soltools/util/makefile.pmk +++ b/soltools/util/makefile.pmk @@ -34,6 +34,10 @@ ADJUSTVISIBILITY=$(AUGMENT_LIBRARY_PATH) $(BIN)$/adjustvisibility # avoid STLPort NO_DEFAULT_STL=TRUE SOLARINC!:=$(subst,/stl$(SPACECHAR),dont_use_stl$(SPACECHAR) $(SOLARINC)) +.IF "$(STLPORT4)" != "" +SOLARINC!:=$(subst,$(STLPORT4)/include/stlport,dont_use_stl$(SPACECHAR) $(SOLARINC)) +SOLARINC!:=$(subst,$(STLPORT4)/stlport,dont_use_stl$(SPACECHAR) $(SOLARINC)) +.ENDIF .IF "$(OS)"=="SOLARIS" # hack due to #i53089# |