diff -urN Makefile.in Makefile.in
--- Makefile.in
+++ Makefile.in
@@ -160,7 +160,8 @@
 COMPILE_JAVAHL_JAVAC = $(JAVAC) $(JAVAC_FLAGS)
 COMPILE_JAVAHL_JAVAH = $(JAVAH)
 
-LINK = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(CFLAGS) $(LDFLAGS) -rpath $(libdir)
+LINK = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(CFLAGS) $(LDFLAGS)
+LINK_LIB = $(LINK) -rpath $(libdir)
 
 # special link rule for mod_dav_svn
 LINK_APACHE_MOD = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(CFLAGS) $(LDFLAGS) -rpath $(APACHE_LIBEXECDIR) -avoid-version -module
@@ -618,7 +619,9 @@
 	./config.status subversion/bindings/swig/perl/native/Makefile.PL
 
 $(SWIG_PL_DIR)/native/Makefile: $(SWIG_PL_DIR)/native/Makefile.PL
-	cd $(SWIG_PL_DIR)/native; $(PERL) Makefile.PL
+	cd $(SWIG_PL_DIR)/native; \
+		$(PERL) Makefile.PL INSTALLDIRS=vendor; \
+		sed -i -e 's/^LD_RUN_PATH/#&/' Makefile Makefile.[a-z]*
 
 swig-pl_DEPS = autogen-swig-pl libsvn_client libsvn_delta libsvn_diff \
   libsvn_fs libsvn_ra libsvn_repos libsvn_subr libsvn_wc libsvn_swig_perl \
diff -urN build/generator/gen_base.py build/generator/gen_base.py
--- build/generator/gen_base.py
+++ build/generator/gen_base.py
@@ -344,7 +344,7 @@
     self.install = options.get('install')
     self.compile_cmd = options.get('compile-cmd')
     self.sources = options.get('sources', '*.c')
-    self.link_cmd = options.get('link-cmd', '$(LINK)')
+    self.link_cmd = options.get('link-cmd', '$(LINK_LIB)')
 
     self.external_lib = options.get('external-lib')
     self.external_project = options.get('external-project')
@@ -395,6 +395,7 @@
       extmap = self.gen_obj._extension_map
       self.objext = extmap['exe', 'object']
       self.filename = build_path_join(self.path, name + extmap['exe', 'target'])
+      self.link_cmd = '$(LINK)'
 
     self.manpages = options.get('manpages', '')
     self.testing = options.get('testing')
diff -urN build.conf build.conf
--- build.conf
+++ build.conf
@@ -356,7 +356,7 @@
 lang = python
 path = subversion/bindings/swig/python/libsvn_swig_py
 libs = libsvn_client libsvn_subr libsvn_delta libsvn_wc apr
-link-cmd = $(LINK) $(SWIG_PY_LIBS)
+link-cmd = $(LINK_LIB) $(SWIG_PY_LIBS)
 install = swig-py-lib
 # need special build rule to include -DSWIGPYTHON
 compile-cmd = $(COMPILE_SWIG_PY)
--- build/generator/gen_make.py
+++ build/generator/gen_make.py
@@ -408,8 +408,8 @@
           name = string.replace(base, 'mod_', '')
           self.ofile.write('\tcd %s ; '
                            '$(MKDIR) "$(APACHE_LIBEXECDIR)" ; '
-                           '$(INSTALL_MOD_SHARED) -n %s %s\n'
-                           % (dirname, name, fname))
+                           '$(INSTALL_LIB) %s $(APACHE_LIBEXECDIR)\n'
+                           % (dirname, fname))
           if ext == '.la':
             la_tweaked[file + '-a'] = None