1 diff -urN subversion-r2817.org/build/gen_base.py subversion-r2817/build/gen_base.py
2 --- subversion-r2817.org/build/gen_base.py Wed Jul 31 14:44:14 2002
3 +++ subversion-r2817/build/gen_base.py Wed Jul 31 14:46:50 2002
5 # Construct a .libs directory within the Apache area and populate it
6 # with the appropriate files. Also drop the .la file in the target dir.
7 self.ofile.write('\ninstall-mods-static: %s\n'
9 + '\t$(MKDIR) $(DESTDIR)%s\n'
10 % (string.join(la_tweaked + s_files),
11 os.path.join('$(APACHE_TARGET)', '.libs')))
12 for file in la_tweaked:
13 dirname, fname = os.path.split(file)
14 base = os.path.splitext(fname)[0]
15 - self.ofile.write('\t$(INSTALL_MOD_STATIC) %s %s\n'
16 - '\t$(INSTALL_MOD_STATIC) %s %s\n'
17 + self.ofile.write('\t$(INSTALL_MOD_STATIC) %s $(DESTDIR)%s\n'
18 + '\t$(INSTALL_MOD_STATIC) %s $(DESTDIR)%s\n'
19 % (os.path.join(dirname, '.libs', base + '.a'),
20 os.path.join('$(APACHE_TARGET)',
24 # copy the other files to the target dir
26 - self.ofile.write('\t$(INSTALL_MOD_STATIC) %s %s\n'
27 + self.ofile.write('\t$(INSTALL_MOD_STATIC) %s $(DESTDIR)%s\n'
28 % (file, os.path.join('$(APACHE_TARGET)',
29 os.path.basename(file))))
30 self.ofile.write('\n')
32 elif area != 'test' and area != 'fs-test':
33 area_var = string.replace(area, '-', '_')
34 self.ofile.write('install-%s: %s\n'
35 - '\t$(MKDIR) $(%sdir)\n'
36 + '\t$(MKDIR) $(DESTDIR)$(%sdir)\n'
37 % (area, string.join(files), area_var))
39 # cd to dirname before install to work around libtool 1.4.2 bug.
40 dirname, fname = os.path.split(file)
41 - self.ofile.write('\tcd %s ; $(INSTALL_%s) %s %s\n'
42 + self.ofile.write('\tcd %s ; $(INSTALL_%s) %s $(DESTDIR)%s\n'
44 string.upper(area_var),
48 includedir = os.path.join('$(includedir)', 'subversion-%s' % self.version)
49 self.ofile.write('install-include: %s\n'
51 + '\t$(MKDIR) $(DESTDIR)%s\n'
52 % (string.join(self.includes), includedir))
53 for file in self.includes:
54 - self.ofile.write('\t$(INSTALL_INCLUDE) %s %s\n'
55 + self.ofile.write('\t$(INSTALL_INCLUDE) %s $(DESTDIR)%s\n'
56 % (os.path.join('$(top_srcdir)', file),
57 os.path.join(includedir, os.path.basename(file))))