- ac build note

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

diff --git a/subversion-DESTDIR.patch b/subversion-DESTDIR.patch
index d4759e604314231847c04e4b082f59144f35d66b..876c1593acf5e8e73690d3d4959e683163fa21cd 100644 (file)
--- a/subversion-DESTDIR.patch
+++ b/subversion-DESTDIR.patch
@@ -20,13 +20,20 @@
  
 --- 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,7 +125,7 @@
+@@ -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]
+ [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]
+