- ac build note

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

diff --git a/subversion-DESTDIR.patch b/subversion-DESTDIR.patch
index 22487cd90148c800d5ab3c931d27a47e3295791c..876c1593acf5e8e73690d3d4959e683163fa21cd 100644 (file)
--- a/subversion-DESTDIR.patch
+++ b/subversion-DESTDIR.patch
@@ -1,31 +1,39 @@
 --- 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
-@@ -102,7 +102,7 @@
+@@ -116,7 +116,7 @@
+            @SVN_SQLITE_INCLUDES@ @SVN_ZLIB_INCLUDES@
  
  APACHE_INCLUDES = @APACHE_INCLUDES@
- APACHE_TARGET = @APACHE_TARGET@
 -APACHE_LIBEXECDIR = $(DESTDIR)@APACHE_LIBEXECDIR@
 +APACHE_LIBEXECDIR = @APACHE_LIBEXECDIR@
  APACHE_LDFLAGS = @APACHE_LDFLAGS@
  
  SWIG = @SWIG@
-@@ -183,7 +183,7 @@
- INSTALL_DAV_LIB = $(INSTALL_LIB)
- INSTALL_BIN = $(LIBTOOL) --mode=install $(INSTALL)
+@@ -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_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':
+ 
+--- subversion-1.7.0-rc3/build/generator/templates/makefile.ezt~       2011-04-27 23:54:33.000000000 +0200
++++ subversion-1.7.0-rc3/build/generator/templates/makefile.ezt        2011-09-16 08:46:27.559338812 +0200
+@@ -125,13 +125,13 @@
+ ########################################
+ [for areas]
+ [is areas.type "apache-mod"]install-mods-shared:[for areas.files] [areas.files.fullname][end][for areas.files]
+-      cd [areas.files.dirname] ; $(MKDIR) "$(APACHE_LIBEXECDIR)" ; $(INSTALL_MOD_SHARED) -n [areas.files.name] [areas.files.filename][end]
++      cd [areas.files.dirname] ; $(MKDIR) "$(DESTDIR)$(APACHE_LIBEXECDIR)" ; $(INSTALL_MOD_SHARED) -n [areas.files.name] [areas.files.filename][end]
+ [else]install-[areas.type]: [for areas.files][if-index areas.files first][else] [end][areas.files.fullname][end] [for areas.apache_files] [areas.apache_files.fullname][end]
+       $(MKDIR) $(DESTDIR)$([areas.varname]dir)[for areas.files][is areas.type "locale"]
+       $(MKDIR) [areas.files.installdir]
+       cd [areas.files.dirname] ; $(INSTALL_[areas.uppervar]) [areas.files.filename] [areas.files.installdir]/$(PACKAGE_NAME)[areas.files.objext][else]
+       cd [areas.files.dirname] ; $(INSTALL_[areas.uppervar]) [areas.files.filename] $(DESTDIR)[areas.files.install_fname][end][end][for areas.apache_files]
+-      cd [areas.apache_files.dirname] ; $(MKDIR) "$(APACHE_LIBEXECDIR)" ; $(INSTALL_MOD_SHARED) -n [areas.apache_files.name] [areas.apache_files.filename][end]
++      cd [areas.apache_files.dirname] ; $(MKDIR) "$(DESTDIR)$(APACHE_LIBEXECDIR)" ; $(INSTALL_MOD_SHARED) -n [areas.apache_files.name] [areas.apache_files.filename][end]
+ [if-any areas.extra_install]  $(INSTALL_EXTRA_[areas.uppervar])
+ [end][end][end]
+ 
+