Feature Request 1010955: Add a new default option syntax.

Author: myrkraverk

src/C/pljava/Makefile

@@ -130,18 +130,20 @@ else
 
 		ifdef USE_LD_RPATH
 			ifeq (${USE_LD_RPATH},1)
-				SHLIB_LINK += -rpath ${JVM_LIB}
+				SHLIB_LINK += -Wl,-rpath,${JVM_LIB}
 			else
 			ifeq (${USE_LD_RPATH},2)
+				SHLIB_LINK += -rpath ${JVM_LIB}
+			ifeq (${USE_LD_RPATH},3)
 				SHLIB_LINK += -R${JVM_LIB}
 			else
-			ifeq (${USE_LD_RPATH},3)
+			ifeq (${USE_LD_RPATH},4)
 				SHLIB_LINK += -R ${JVM_LIB}
 			else
-			ifeq (${USE_LD_RPATH},4)
+			ifeq (${USE_LD_RPATH},5)
 				SHLIB_LINK += -Wl,-R${JVM_LIB}
 			else
-			ifeq (${USE_LD_RPATH},5)
+			ifeq (${USE_LD_RPATH},6)
 				SHLIB_LINK += -Wl,-R,${JVM_LIB}
 			endif
 			endif