--- subversion/bindings/swig/perl/native/Makefile.PL.in.orig	Sat Oct 15 00:45:33 2005
+++ subversion/bindings/swig/perl/native/Makefile.PL.in	Wed Nov  2 21:58:44 2005
@@ -1,4 +1,5 @@
-#!/usr/bin/perl
+#!/usr/bin/perl -w
+use strict;
 use ExtUtils::MakeMaker;
 use Config;
 use Cwd 'abs_path';
@@ -15,6 +16,11 @@
 my $swig_srcdir = "${svnlib_srcdir}/bindings/swig";
 my $swig_builddir = "${svnlib_builddir}/bindings/swig";
 
+my $top_builddir = '../../../../..';
+my $top_srcdir = '@top_srcdir@';
+my $svnlib_srcdir = "${top_srcdir}/subversion";
+my $swig_srcdir = "${svnlib_srcdir}/bindings/swig";
+
 my @modules = qw/client delta fs ra repos wc/;
 my @ldpaths = ("$swig_builddir/perl/libsvn_swig_perl/.libs",
                map {"$svnlib_builddir/libsvn_$_/.libs"} (@modules, qw/diff subr
@@ -45,8 +51,7 @@
     OBJECT => q/$(O_FILES)/,
     LIBS => [join(' ', $apr_ldflags,
                   (map {$_ = abs_path($_); "-L$_"} @ldpaths),
-                  @ldmodules, '-lsvn_swig_perl-1',
-                  `$swig -perl -ldflags`)],
+                  @ldmodules, '-lsvn_swig_perl-1')],
     test => { TESTS => "$swig_srcdir/perl/native/t/*.t" }
 );
 
@@ -61,6 +66,7 @@
                       "\$(INST_LIBDIR)/$_.pm") }
          map { perlish $_ }
          ('base', 'core', @modules)},
+        LDFROM => '$(O_FILES) '."../libsvn_swig_perl/.libs/libsvn_swig_perl-1.a",
         MAN3PODS => {map { ("$swig_srcdir/perl/native/$_.pm" =>
                             "\$(INST_MAN3DIR)/SVN::$_.\$(MAN3EXT)") }
          map { perlish $_ }