- release 2

[packages/subversion.git] / subversion-DESTDIR.patch

--- subversion-1.3.0/Makefile.in.orig	2005-11-16 01:56:15.000000000 +0100
+++ subversion-1.3.0/Makefile.in	2006-01-13 21:40:47.795759000 +0100
@@ -116,7 +116,7 @@
            @SVN_SQLITE_INCLUDES@ @SVN_ZLIB_INCLUDES@
 
 APACHE_INCLUDES = @APACHE_INCLUDES@
-APACHE_LIBEXECDIR = $(DESTDIR)@APACHE_LIBEXECDIR@
+APACHE_LIBEXECDIR = @APACHE_LIBEXECDIR@
 APACHE_LDFLAGS = @APACHE_LDFLAGS@
 
 SWIG = @SWIG@
@@ -214,7 +214,7 @@
 INSTALL_CONTRIB = $(LIBTOOL) --mode=install $(INSTALL)
 INSTALL_TOOLS = $(LIBTOOL) --mode=install $(INSTALL)
 INSTALL_INCLUDE = $(INSTALL) -m 644
-INSTALL_MOD_SHARED = @APXS@ -i -S LIBEXECDIR="$(APACHE_LIBEXECDIR)" @MOD_ACTIVATION@
+INSTALL_MOD_SHARED = @APXS@ -i -S LIBEXECDIR="$(APACHE_LIBEXECDIR)" -S DESTDIR="$(DESTDIR)" @MOD_ACTIVATION@
 INSTALL_DATA = $(INSTALL) -m 644
 INSTALL_LOCALE = $(INSTALL_DATA)
 
--- subversion-1.3.0/build/generator/gen_make.py.orig	2005-11-17 01:43:35.000000000 +0100
+++ subversion-1.3.0/build/generator/gen_make.py	2006-01-13 21:40:05.377108000 +0100
@@ -407,7 +407,7 @@
           base, ext = os.path.splitext(fname)
           name = string.replace(base, 'mod_', '')
           self.ofile.write('\tcd %s ; '
-                           '$(MKDIR) "$(APACHE_LIBEXECDIR)" ; '
+                           '$(MKDIR) "$(DESTDIR)$(APACHE_LIBEXECDIR)" ; '
                            '$(INSTALL_MOD_SHARED) -n %s %s\n'
                            % (dirname, name, fname))
           if ext == '.la':