]>
Commit | Line | Data |
---|---|---|
fe707327 JB |
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 | |
ce46892b AM |
3 | @@ -116,7 +116,7 @@ |
4 | @SVN_SQLITE_INCLUDES@ @SVN_ZLIB_INCLUDES@ | |
e5c3b97f | 5 | |
fe707327 | 6 | APACHE_INCLUDES = @APACHE_INCLUDES@ |
fe707327 JB |
7 | -APACHE_LIBEXECDIR = $(DESTDIR)@APACHE_LIBEXECDIR@ |
8 | +APACHE_LIBEXECDIR = @APACHE_LIBEXECDIR@ | |
d493020f | 9 | APACHE_LDFLAGS = @APACHE_LDFLAGS@ |
e5c3b97f | 10 | |
fe707327 | 11 | SWIG = @SWIG@ |
ce46892b AM |
12 | @@ -214,7 +214,7 @@ |
13 | INSTALL_CONTRIB = $(LIBTOOL) --mode=install $(INSTALL) | |
14 | INSTALL_TOOLS = $(LIBTOOL) --mode=install $(INSTALL) | |
fe707327 JB |
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@ | |
fe707327 JB |
18 | INSTALL_DATA = $(INSTALL) -m 644 |
19 | INSTALL_LOCALE = $(INSTALL_DATA) | |
ce46892b | 20 | |
fe707327 JB |
21 | --- subversion-1.3.0/build/generator/gen_make.py.orig 2005-11-17 01:43:35.000000000 +0100 |
22 | +++ subversion-1.3.0/build/generator/gen_make.py 2006-01-13 21:40:05.377108000 +0100 | |
23 | @@ -407,7 +407,7 @@ | |
24 | base, ext = os.path.splitext(fname) | |
25 | name = string.replace(base, 'mod_', '') | |
26 | self.ofile.write('\tcd %s ; ' | |
27 | - '$(MKDIR) "$(APACHE_LIBEXECDIR)" ; ' | |
28 | + '$(MKDIR) "$(DESTDIR)$(APACHE_LIBEXECDIR)" ; ' | |
29 | '$(INSTALL_MOD_SHARED) -n %s %s\n' | |
30 | % (dirname, name, fname)) | |
31 | if ext == '.la': |