SOURCES: subversion-DESTDIR.patch - fixes build without installed ...

[qboosh]

Author: qboosh                       Date: Fri Jan 13 21:28:13 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- fixes build without installed subversion-devel

---- Files affected:
SOURCES:
   subversion-DESTDIR.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SOURCES/subversion-DESTDIR.patch
diff -u SOURCES/subversion-DESTDIR.patch:1.1 SOURCES/subversion-DESTDIR.patch:1.2
--- SOURCES/subversion-DESTDIR.patch:1.1	Wed Jul 31 21:22:26 2002
+++ SOURCES/subversion-DESTDIR.patch	Fri Jan 13 22:28:08 2006
@@ -1,58 +1,31 @@
-diff -urN subversion-r2817.org/build/gen_base.py subversion-r2817/build/gen_base.py
---- subversion-r2817.org/build/gen_base.py	Wed Jul 31 14:44:14 2002
-+++ subversion-r2817/build/gen_base.py	Wed Jul 31 14:46:50 2002
-@@ -265,14 +265,14 @@
-         # Construct a .libs directory within the Apache area and populate it
-         # with the appropriate files. Also drop the .la file in the target dir.
-         self.ofile.write('\ninstall-mods-static: %s\n'
--                         '\t$(MKDIR) %s\n'
-+                         '\t$(MKDIR) $(DESTDIR)%s\n'
-                          % (string.join(la_tweaked + s_files),
-                             os.path.join('$(APACHE_TARGET)', '.libs')))
-         for file in la_tweaked:
-           dirname, fname = os.path.split(file)
-           base = os.path.splitext(fname)[0]
--          self.ofile.write('\t$(INSTALL_MOD_STATIC) %s %s\n'
--                           '\t$(INSTALL_MOD_STATIC) %s %s\n'
-+          self.ofile.write('\t$(INSTALL_MOD_STATIC) %s $(DESTDIR)%s\n'
-+                           '\t$(INSTALL_MOD_STATIC) %s $(DESTDIR)%s\n'
-                            % (os.path.join(dirname, '.libs', base + '.a'),
-                               os.path.join('$(APACHE_TARGET)',
-                                            '.libs',
-@@ -282,7 +282,7 @@
+--- 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
+@@ -105,7 +105,7 @@
  
-         # copy the other files to the target dir
-         for file in s_files:
--          self.ofile.write('\t$(INSTALL_MOD_STATIC) %s %s\n'
-+          self.ofile.write('\t$(INSTALL_MOD_STATIC) %s $(DESTDIR)%s\n'
-                            % (file, os.path.join('$(APACHE_TARGET)',
-                                                  os.path.basename(file))))
-         self.ofile.write('\n')
-@@ -290,12 +290,12 @@
-       elif area != 'test' and area != 'fs-test':
-         area_var = string.replace(area, '-', '_')
-         self.ofile.write('install-%s: %s\n'
--                         '\t$(MKDIR) $(%sdir)\n'
-+                         '\t$(MKDIR) $(DESTDIR)$(%sdir)\n'
-                          % (area, string.join(files), area_var))
-         for file in files:
-           # cd to dirname before install to work around libtool 1.4.2 bug.
-           dirname, fname = os.path.split(file)
--          self.ofile.write('\tcd %s ; $(INSTALL_%s) %s %s\n'
-+          self.ofile.write('\tcd %s ; $(INSTALL_%s) %s $(DESTDIR)%s\n'
-                            % (dirname,
-                               string.upper(area_var),
-                               fname,
-@@ -313,10 +313,10 @@
- 
-     includedir = os.path.join('$(includedir)', 'subversion-%s' % self.version)
-     self.ofile.write('install-include: %s\n'
--                     '\t$(MKDIR) %s\n'
-+                     '\t$(MKDIR) $(DESTDIR)%s\n'
-                      % (string.join(self.includes), includedir))
-     for file in self.includes:
--      self.ofile.write('\t$(INSTALL_INCLUDE) %s %s\n'
-+      self.ofile.write('\t$(INSTALL_INCLUDE) %s $(DESTDIR)%s\n'
-                        % (os.path.join('$(top_srcdir)', file),
-                           os.path.join(includedir, os.path.basename(file))))
+ APACHE_INCLUDES = @APACHE_INCLUDES@
+ APACHE_TARGET = @APACHE_TARGET@
+-APACHE_LIBEXECDIR = $(DESTDIR)@APACHE_LIBEXECDIR@
++APACHE_LIBEXECDIR = @APACHE_LIBEXECDIR@
  
+ SWIG = @SWIG@
+ SWIG_INCLUDES = -I$(SWIG_BUILD_DIR) \
+@@ -183,7 +183,7 @@
+ INSTALL_DAV_LIB = $(INSTALL_LIB)
+ INSTALL_BIN = $(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_MOD_STATIC = $(INSTALL) -m 644
+ 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':
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/subversion-DESTDIR.patch?r1=1.1&r2=1.2&f=u