subversion-DESTDIR.patch

   1 --- subversion-1.3.0/Makefile.in.orig   2005-11-16 01:56:15.000000000 +0100
   2 +++ subversion-1.3.0/Makefile.in        2006-01-13 21:40:47.795759000 +0100
   3 @@ -116,7 +116,7 @@
   4             @SVN_SQLITE_INCLUDES@ @SVN_ZLIB_INCLUDES@
   5
   6  APACHE_INCLUDES = @APACHE_INCLUDES@
   7 -APACHE_LIBEXECDIR = $(DESTDIR)@APACHE_LIBEXECDIR@
   8 +APACHE_LIBEXECDIR = @APACHE_LIBEXECDIR@
   9  APACHE_LDFLAGS = @APACHE_LDFLAGS@
  10
  11  SWIG = @SWIG@
  12 @@ -214,7 +214,7 @@
  13  INSTALL_CONTRIB = $(LIBTOOL) --mode=install $(INSTALL)
  14  INSTALL_TOOLS = $(LIBTOOL) --mode=install $(INSTALL)
  15  INSTALL_INCLUDE = $(INSTALL) -m 644
  16 -INSTALL_MOD_SHARED = @APXS@ -i -S LIBEXECDIR="$(APACHE_LIBEXECDIR)" @MOD_ACTIVATION@
  17 +INSTALL_MOD_SHARED = @APXS@ -i -S LIBEXECDIR="$(APACHE_LIBEXECDIR)" -S DESTDIR="$(DESTDIR)" @MOD_ACTIVATION@
  18  INSTALL_DATA = $(INSTALL) -m 644
  19  INSTALL_LOCALE = $(INSTALL_DATA)
  20
  21 --- subversion-1.7.0-rc3/build/generator/templates/makefile.ezt~        2011-04-27 23:54:33.000000000 +0200
  22 +++ subversion-1.7.0-rc3/build/generator/templates/makefile.ezt 2011-09-16 08:46:27.559338812 +0200
  23 @@ -125,13 +125,13 @@
  24  ########################################
  25  [for areas]
  26  [is areas.type "apache-mod"]install-mods-shared:[for areas.files] [areas.files.fullname][end][for areas.files]
  27 -       cd [areas.files.dirname] ; $(MKDIR) "$(APACHE_LIBEXECDIR)" ; $(INSTALL_MOD_SHARED) -n [areas.files.name] [areas.files.filename][end]
  28 +       cd [areas.files.dirname] ; $(MKDIR) "$(DESTDIR)$(APACHE_LIBEXECDIR)" ; $(INSTALL_MOD_SHARED) -n [areas.files.name] [areas.files.filename][end]
  29  [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]
  30         $(MKDIR) $(DESTDIR)$([areas.varname]dir)[for areas.files][is areas.type "locale"]
  31         $(MKDIR) [areas.files.installdir]
  32         cd [areas.files.dirname] ; $(INSTALL_[areas.uppervar]) [areas.files.filename] [areas.files.installdir]/$(PACKAGE_NAME)[areas.files.objext][else]
  33         cd [areas.files.dirname] ; $(INSTALL_[areas.uppervar]) [areas.files.filename] $(DESTDIR)[areas.files.install_fname][end][end][for areas.apache_files]
  34 -       cd [areas.apache_files.dirname] ; $(MKDIR) "$(APACHE_LIBEXECDIR)" ; $(INSTALL_MOD_SHARED) -n [areas.apache_files.name] [areas.apache_files.filename][end]
  35 +       cd [areas.apache_files.dirname] ; $(MKDIR) "$(DESTDIR)$(APACHE_LIBEXECDIR)" ; $(INSTALL_MOD_SHARED) -n [areas.apache_files.name] [areas.apache_files.filename][end]
  36  [if-any areas.extra_install]   $(INSTALL_EXTRA_[areas.uppervar])
  37  [end][end][end]
  38
  39