index 98eb989f2d055e34c8eab7899c8714e5d2f35e91..c945a0b8185953d773903468364edf878b35cb23 100644 (file)
-Index: pkg-rrdtool/bindings/perl-shared/Makefile.PL
-===================================================================
---- pkg-rrdtool.orig/bindings/perl-shared/Makefile.PL 2008-02-10 15:31:58.000000000 +0100
-+++ pkg-rrdtool/bindings/perl-shared/Makefile.PL 2008-02-10 15:34:16.000000000 +0100
-@@ -3,26 +3,7 @@
- # See lib/ExtUtils/MakeMaker.pm for details of how to influence
- # the contents of the Makefile that is written.
-
--# if the last argument when calling Makefile.PL is RPATH=/... and ... is the
--# path to librrd.so then the Makefile will be written such that RRDs.so knows
--# where to find librrd.so later on ...
- my $R="";
--if ($ARGV[-1] =~ /RPATH=(\S+)/){
-- pop @ARGV;
-- my $rp = $1;
-- for ($^O){
-- /linux/ && do{ $R = "-Wl,--rpath -Wl,$rp"};
-- /hpux/ && do{ $R = "+b$rp"};
-- /solaris/ && do{ $R = "-R$rp"};
-- /aix/ && do{ $R = "-Wl,-blibpath:$rp"};
+diff a/bindings/perl-shared/Makefile.PL b/bindings/perl-shared/Makefile.PL
+--- a/bindings/perl-shared/Makefile.PL
++++ b/bindings/perl-shared/Makefile.PL
+@@ -20,26 +20,7 @@ if (($Config{'osname'} eq 'MSWin32' && $
+ ) : ()
+ );
+ }else{
+- # if the last argument when calling Makefile.PL is RPATH=/... and ... is the
+- # path to librrd.so then the Makefile will be written such that RRDs.so knows
+- # where to find librrd.so later on ...
+ my $R="";
+- if ($ARGV[-1] =~ /RPATH=(\S+)/){
+- pop @ARGV;
+- my $rp = $1;
+- for ($^O){
+- /linux/ && do{ $R = "-Wl,--rpath -Wl,$rp"};
+- /hpux/ && do{ $R = "+b$rp"};
+- /solaris/ && do{ $R = "-R$rp"};
+- /bsd/ && do{ $R = "-R$rp"};
+- /aix/ && do{ $R = "-blibpath:$rp"};
+- }
- }
--}
-
--# darwin works without this because librrd contains its
--# install_name which will includes the final location of the
--# library after it is installed. This install_name gets transfered
--# to the perl shared object.
--
- my $librrd = "-L../../src/.libs/ $R -lrrd";
-
- WriteMakefile(
+- # darwin works without this because librrd contains its
+- # install_name which will includes the final location of the
+- # library after it is installed. This install_name gets transfered
+- # to the perl shared object.
+ my $librrd;
+ if ($^O eq 'darwin'){
+ $librrd = '-lrrd';