--- stlport/makefile.mk	18 Jul 2005 08:43:21 -0000	1.31
+++ stlport/makefile.mk	3 Aug 2005 15:37:32 -0000
@@ -203,7 +203,6 @@
 all :
        @echo "         An already available installation of STLport has been chosen in the configure process."
        @echo "         Therefore the version provided here does not need to be built in addition."
-       +$(COPY) $(STLPORT4)$/lib$/*stlport*$(DLLPOST) $(DLLDEST)
 .ENDIF
 
 .INCLUDE : 	set_ext.mk
--- scp2/source/ooo/makefile.mk	2006-04-30 12:02:20.000000000 +0200
+++ scp2/source/ooo/makefile.mk	2006-04-30 12:03:58.000000000 +0200
@@ -107,7 +107,7 @@
 SCPDEFS+=-DSYSTEM_DB
 .ENDIF
 
-.IF "$(USE_SYSTEM_STL)" == "YES"
+.IF "$(USE_SYSTEM_STL)" == "YES" || "$(STLPORT4)" != "NO_STLPORT4"
 SCPDEFS+=-DUSE_SYSTEM_STL
 .ENDIF
 
--- scp2/source/ure/makefile.mk	2006-04-30 12:02:09.000000000 +0200
+++ scp2/source/ure/makefile.mk	2006-04-30 12:03:39.000000000 +0200
@@ -42,7 +42,7 @@
 SCP_PRODUCT_TYPE = ure
 PARFILES = ure.par
 
-.IF "$(USE_SYSTEM_STL)" == "YES"
+.IF "$(USE_SYSTEM_STL)" == "YES" || "$(STLPORT4)" != "NO_STLPORT4"
 SCPDEFS+=-DUSE_SYSTEM_STL
 .ENDIF
 
