-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 @@
+diff -urNp -x '*.orig' subversion-1.14.1.org/Makefile.in subversion-1.14.1/Makefile.in
+--- subversion-1.14.1.org/Makefile.in 2019-12-05 02:43:14.000000000 +0100
++++ subversion-1.14.1/Makefile.in 2021-05-07 23:45:01.980649971 +0200
+@@ -141,7 +141,7 @@ INCLUDES = -I$(top_srcdir)/subversion/in
+ @SVN_UTF8PROC_INCLUDES@
- # 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_LIBEXECDIR = $(DESTDIR)@APACHE_LIBEXECDIR@
++APACHE_LIBEXECDIR = @APACHE_LIBEXECDIR@
+ APACHE_LDFLAGS = @APACHE_LDFLAGS@
+ BOOST_TEST_CPPFLAGS = @BOOST_CPPFLAGS@ -DBOOST_TEST_DYN_LINK -DBOOST_TEST_NO_MAIN
+@@ -325,7 +325,7 @@ INSTALL_BIN = $(LIBTOOL) --mode=install
+ 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_DATA = $(INSTALL) -m 644
+ INSTALL_LOCALE = $(INSTALL_DATA)
+ INSTALL_APACHE_MODS = @INSTALL_APACHE_MODS@
+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
+--- subversion-1.14.1.org/build/generator/templates/build-outputs.mk.ezt 2019-11-04 06:59:36.000000000 +0100
++++ subversion-1.14.1/build/generator/templates/build-outputs.mk.ezt 2021-05-07 23:45:01.980649971 +0200
+@@ -137,7 +137,7 @@ $([target.varname]_HEADERS) $([target.va
+ ########################################
+ [for areas]
+ install-[areas.type]: [for areas.files][if-index areas.files first][else] [end][areas.files.fullname][end]
+-[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]
++[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]
+ [else][end][is areas.type "locale"]$(MKDIR) [areas.files.installdir]
+ [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]
+ [if-any areas.files.pc_fullname]$(INSTALL_DATA) [areas.files.pc_fullname] $(DESTDIR)[areas.files.pc_install_fname][end][end][end]
projects / packages / subversion.git / blobdiff