INTEGRATION: CWS sb83 (1.10.4); FILE MERGED

2008/03/17 08:54:45 sb 1.10.4.2: RESYNC: (1.10-1.11); FILE MERGED
2008/01/08 16:37:52 sb 1.10.4.1: #i84200# changing LINKFLAGSRUNPATH superseded by APPnRPATH

registry/tools/makefile.mk

@@ -4,9 +4,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.11 $
+#   $Revision: 1.12 $
 #
-#   last change: $Author: obo $ $Date: 2008-02-25 16:03:09 $
+#   last change: $Author: vg $ $Date: 2008-03-18 12:38:02 $
 #
 #   The Contents of this file are made available subject to
 #   the terms of GNU Lesser General Public License Version 2.1.
@@ -42,12 +42,6 @@ LIBTARGET=NO
 
 ENABLE_EXCEPTIONS := TRUE
 
-.IF "$(OS)" == "LINUX"
-LINKFLAGSRUNPATH = -Wl,-rpath,\''$$ORIGIN/../lib:$$ORIGIN'\'
-.ELIF "$(OS)" == "SOLARIS"
-LINKFLAGSRUNPATH = -R\''$$ORIGIN/../lib:$$ORIGIN'\'
-.ENDIF
-
 # --- Settings -----------------------------------------------------
 .INCLUDE :  settings.mk