subversion-DESTDIR.patch

   1 diff -urNp -x '*.orig' subversion-1.14.1.org/Makefile.in subversion-1.14.1/Makefile.in
   2 --- subversion-1.14.1.org/Makefile.in   2019-12-05 02:43:14.000000000 +0100
   3 +++ subversion-1.14.1/Makefile.in       2021-05-07 23:45:01.980649971 +0200
   4 @@ -141,7 +141,7 @@ INCLUDES = -I$(top_srcdir)/subversion/in
   5             @SVN_UTF8PROC_INCLUDES@
   6
   7  APACHE_INCLUDES = @APACHE_INCLUDES@
   8 -APACHE_LIBEXECDIR = $(DESTDIR)@APACHE_LIBEXECDIR@
   9 +APACHE_LIBEXECDIR = @APACHE_LIBEXECDIR@
  10  APACHE_LDFLAGS = @APACHE_LDFLAGS@
  11
  12  BOOST_TEST_CPPFLAGS = @BOOST_CPPFLAGS@ -DBOOST_TEST_DYN_LINK -DBOOST_TEST_NO_MAIN
  13 @@ -325,7 +325,7 @@ INSTALL_BIN = $(LIBTOOL) --mode=install
  14  INSTALL_CONTRIB = $(LIBTOOL) --mode=install $(INSTALL)
  15  INSTALL_TOOLS = $(LIBTOOL) --mode=install $(INSTALL)
  16  INSTALL_INCLUDE = $(INSTALL) -m 644
  17 -INSTALL_MOD_SHARED = @APXS@ -i -S LIBEXECDIR="$(APACHE_LIBEXECDIR)" @MOD_ACTIVATION@
  18 +INSTALL_MOD_SHARED = @APXS@ -i -S LIBEXECDIR="$(APACHE_LIBEXECDIR)" -S DESTDIR="$(DESTDIR)" @MOD_ACTIVATION@
  19  INSTALL_DATA = $(INSTALL) -m 644
  20  INSTALL_LOCALE = $(INSTALL_DATA)
  21  INSTALL_APACHE_MODS = @INSTALL_APACHE_MODS@
  22 diff -urNp -x '*.orig' subversion-1.14.1.org/build/generator/templates/build-outputs.mk.ezt subversion-1.14.1/build/generator/templates/build-outputs.mk.ezt
  23 --- subversion-1.14.1.org/build/generator/templates/build-outputs.mk.ezt        2019-11-04 06:59:36.000000000 +0100
  24 +++ subversion-1.14.1/build/generator/templates/build-outputs.mk.ezt    2021-05-07 23:45:01.980649971 +0200
  25 @@ -137,7 +137,7 @@ $([target.varname]_HEADERS) $([target.va
  26  ########################################
  27  [for areas]
  28  install-[areas.type]: [for areas.files][if-index areas.files first][else] [end][areas.files.fullname][end]
  29 -[if-any areas.files][for areas.files]  [is areas.files.mode "apache-mod"][if-any areas.files.when]if $([areas.files.when]) ; then [else][end]cd [areas.files.dirname] ; $(MKDIR) "$(APACHE_LIBEXECDIR)" ; $(INSTALL_MOD_SHARED) -n [areas.files.name] [areas.files.filename][if-any areas.files.when] ; fi[else][end][else][if-index areas.files first]$(MKDIR) $(DESTDIR)$([areas.varname]dir)[if-any areas.files.pc_installdir] $(DESTDIR)[areas.files.pc_installdir][end]
  30 +[if-any areas.files][for areas.files]  [is areas.files.mode "apache-mod"][if-any areas.files.when]if $([areas.files.when]) ; then [else][end]cd [areas.files.dirname] ; $(MKDIR) "$(DESTDIR)$(APACHE_LIBEXECDIR)" ; $(INSTALL_MOD_SHARED) -n [areas.files.name] [areas.files.filename][if-any areas.files.when] ; fi[else][end][else][if-index areas.files first]$(MKDIR) $(DESTDIR)$([areas.varname]dir)[if-any areas.files.pc_installdir] $(DESTDIR)[areas.files.pc_installdir][end]
  31         [else][end][is areas.type "locale"]$(MKDIR) [areas.files.installdir]
  32         [if-any areas.files.when]if $([areas.files.when]) ; then [else][end]cd [areas.files.dirname] ; $(INSTALL_[areas.uppervar]) [areas.files.filename] [areas.files.installdir]/$(PACKAGE_NAME)[areas.files.objext][if-any areas.files.when] ; fi[else][end][else][if-any areas.files.when]if $([areas.files.when]) ; then [else][end]cd [areas.files.dirname] ; $(INSTALL_[areas.uppervar]) [areas.files.filename] $(DESTDIR)[areas.files.install_fname][if-any areas.files.when] ; fi[else][end]
  33         [if-any areas.files.pc_fullname]$(INSTALL_DATA) [areas.files.pc_fullname] $(DESTDIR)[areas.files.pc_install_fname][end][end][end]