tstellar / rpms / libpcap

Forked from rpms/libpcap 3 years ago
Clone
99e93bf
diff -up libpcap-1.3.0/pcap-config.in.multilib libpcap-1.3.0/pcap-config.in
99e93bf
--- libpcap-1.3.0/pcap-config.in.multilib	2012-03-29 14:57:32.000000000 +0200
99e93bf
+++ libpcap-1.3.0/pcap-config.in	2013-03-26 09:56:16.293324264 +0100
99e93bf
@@ -7,7 +7,6 @@
99e93bf
 prefix="@prefix@"
99e93bf
 exec_prefix="@exec_prefix@"
99e93bf
 includedir="@includedir@"
99e93bf
-libdir="@libdir@"
99e93bf
 V_RPATH_OPT="@V_RPATH_OPT@"
99e93bf
 LIBS="@LIBS@"
99e93bf
 
99e93bf
@@ -36,16 +35,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
 	#
99e93bf
@@ -54,16 +43,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"
99e93bf
@@ -75,15 +64,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