]>
Commit | Line | Data |
---|---|---|
3576e488 | 1 | diff -urN mod_perl-1.99_13-org/lib/Apache/Build.pm mod_perl-1.99_13/lib/Apache/Build.pm |
2 | --- mod_perl-1.99_13-org/lib/Apache/Build.pm 2004-03-04 18:24:32.000000000 +0100 | |
3 | +++ mod_perl-1.99_13/lib/Apache/Build.pm 2004-04-07 15:56:14.946043880 +0200 | |
4 | @@ -1307,12 +1307,12 @@ | |
62efbbce AM |
5 | my $install = <<'EOI'; |
6 | install: | |
7 | # install mod_perl.so | |
8 | - @$(MKPATH) $(MODPERL_AP_LIBEXECDIR) | |
9 | + @$(MKPATH) $(DESTDIR)$(MODPERL_AP_LIBEXECDIR) | |
10 | $(MODPERL_TEST_F) $(MODPERL_LIB_DSO) && \ | |
11 | - $(MODPERL_CP) $(MODPERL_LIB_DSO) $(MODPERL_AP_LIBEXECDIR) | |
12 | + $(MODPERL_CP) $(MODPERL_LIB_DSO) $(DESTDIR)$(MODPERL_AP_LIBEXECDIR) | |
13 | # install mod_perl .h files | |
14 | - @$(MKPATH) $(MODPERL_AP_INCLUDEDIR) | |
15 | - $(MODPERL_CP) $(MODPERL_H_FILES) $(MODPERL_AP_INCLUDEDIR) | |
16 | + @$(MKPATH) $(DESTDIR)$(MODPERL_AP_INCLUDEDIR) | |
17 | + $(MODPERL_CP) $(MODPERL_H_FILES) $(DESTDIR)$(MODPERL_AP_INCLUDEDIR) | |
18 | EOI | |
19 | ||
20 | my $mf = $self->default_file('makefile'); | |
3576e488 | 21 | diff -urN mod_perl-1.99_13-org/Makefile.PL mod_perl-1.99_13/Makefile.PL |
22 | --- mod_perl-1.99_13-org/Makefile.PL 2004-03-04 18:24:28.000000000 +0100 | |
23 | +++ mod_perl-1.99_13/Makefile.PL 2004-04-07 15:57:14.828940296 +0200 | |
24 | @@ -65,7 +65,7 @@ | |
25 | NAME => 'mod_perl', | |
26 | VERSION => $VERSION, | |
27 | ABSTRACT_FROM => 'lib/mod_perl.pm', | |
28 | - EXE_FILES => \@exe_files, | |
29 | +# EXE_FILES => \@exe_files, | |
30 | DEFINE => get_DEFINE(), | |
31 | macro => { | |
f4234c2e | 32 | MODPERL_SRC => $code->path, |
3576e488 | 33 | @@ -483,8 +483,8 @@ |
f4234c2e | 34 | cd "$(MODPERL_SRC)" && $(MODPERL_LIBMAKE) install |
35 | ||
36 | modperl_xs_h_install: | |
37 | - @$(MKPATH) $(MODPERL_AP_INCLUDEDIR) | |
38 | - $(CP) $(MODPERL_XS_H_FILES) $(MODPERL_AP_INCLUDEDIR) | |
39 | + @$(MKPATH) $(DESTDIR)$(MODPERL_AP_INCLUDEDIR) | |
40 | + $(CP) $(MODPERL_XS_H_FILES) $(DESTDIR)$(MODPERL_AP_INCLUDEDIR) | |
41 | ||
42 | modperl_src_clean: | |
43 | cd "$(MODPERL_SRC)" && $(MODPERL_LIBMAKE) clean | |
039a46a8 | 44 | --- mod_perl-1.99_15-org/Makefile.PL 2004-08-24 18:33:21.035839248 +0200 |
45 | +++ mod_perl-1.99_13/Makefile.PL 2004-08-24 18:34:24.406205488 +0200 | |
46 | @@ -151,7 +151,7 @@ | |
47 | error "cannot install mod_perl/$VERSION on top of $vstring", | |
48 | "use MP_INST_APACHE2=1 option " . | |
49 | "or to force installation delete:\n $old_modperl_pm"; | |
50 | - exit 1; | |
51 | +# exit 1; | |
52 | } | |
53 | } | |
54 | } |