3324fa0
diff -up libpcap/pcap-config.in.multilib libpcap/pcap-config.in
07fdab9
--- libpcap/pcap-config.in.multilib	2011-11-23 14:28:54.580396515 +0100
07fdab9
+++ libpcap/pcap-config.in	2011-11-23 14:36:47.408268484 +0100
07fdab9
@@ -36,16 +36,6 @@ do
3324fa0
 	esac
3324fa0
 	shift
3324fa0
 done
07fdab9
-if [ "$V_RPATH_OPT" != "" ]
3324fa0
-then
3324fa0
-	#
3324fa0
-	# If libdir isn't /usr/lib, add it to the run-time linker path.
3324fa0
-	#
07fdab9
-	if [ "$libdir" != "/usr/lib" ]
3324fa0
-	then
07fdab9
-		RPATH=$V_RPATH_OPT$libdir
3324fa0
-	fi
3324fa0
-fi
3324fa0
 if [ "$static" = 1 ]
3324fa0
 then
3324fa0
 	#
07fdab9
@@ -54,16 +44,16 @@ then
3324fa0
 	#
3324fa0
 	if [ "$show_cflags" = 1 -a "$show_libs" = 1 ]
3324fa0
 	then
07fdab9
-		echo "-I$includedir -L$libdir -lpcap $LIBS"
3324fa0
+		echo "-lpcap @LIBS@"
3324fa0
 	elif [ "$show_cflags" = 1 -a "$show_additional_libs" = 1 ]
3324fa0
 	then
07fdab9
-		echo "-I$includedir -L$libdir $LIBS"
3324fa0
+		echo "@LIBS@"
3324fa0
 	elif [ "$show_cflags" = 1 ]
3324fa0
 	then
07fdab9
-		echo "-I$includedir"
3324fa0
+		echo ""
3324fa0
 	elif [ "$show_libs" = 1 ]
3324fa0
 	then
07fdab9
-		echo "-L$libdir -lpcap $LIBS"
3324fa0
+		echo "-lpcap @LIBS@"
3324fa0
 	elif [ "$show_additional_libs" = 1 ]
3324fa0
 	then
07fdab9
 		echo "$LIBS"
07fdab9
@@ -75,15 +65,15 @@ else
3324fa0
 	#
3324fa0
 	if [ "$show_cflags" = 1 -a "$show_libs" = 1 ]
3324fa0
 	then
07fdab9
-		echo "-I$includedir -L$libdir $RPATH -lpcap"
3324fa0
+		echo "-lpcap"
3324fa0
 	elif [ "$show_cflags" = 1 -a "$show_additional_libs" = 1 ]
3324fa0
 	then
07fdab9
-		echo "-I$includedir"
3324fa0
+		echo ""
3324fa0
 	elif [ "$show_cflags" = 1 ]
3324fa0
 	then
07fdab9
-		echo "-I$includedir"
3324fa0
+		echo ""
3324fa0
 	elif [ "$show_libs" = 1 ]
3324fa0
 	then
07fdab9
-		echo "-L$libdir $RPATH -lpcap"
3324fa0
+		echo "-lpcap"
3324fa0
 	fi
3324fa0
 fi