Hi, installing into a separate directory via "make DESTDIR=... install" does not work with RC5.
The attached patch cures that. Another installation target "install_vendor" does not work at all. Distributors like Suse/Novell used to use this target for making RPM packages of Perl modules. Is it worth to support this target? Torsten
diff -Naur mod_perl-2.0.0-RC5/lib/Apache2/Build.pm mod_perl-2.0.0-RC5.new/lib/Apache2/Build.pm
--- mod_perl-2.0.0-RC5/lib/Apache2/Build.pm 2005-04-14 14:19:35.000000000 +0200
+++ mod_perl-2.0.0-RC5.new/lib/Apache2/Build.pm 2005-04-19 18:20:15.670303042 +0200
@@ -1598,16 +1598,16 @@
if (!$self->should_build_apache) {
$install .= <<'EOI';
# install mod_perl.so
- @$(MKPATH) $(MODPERL_AP_LIBEXECDIR)
+ @$(MKPATH) $(DESTDIR)$(MODPERL_AP_LIBEXECDIR)
$(MODPERL_TEST_F) $(MODPERL_LIB_DSO) && \
- $(MODPERL_CP) $(MODPERL_LIB_DSO) $(MODPERL_AP_LIBEXECDIR)
+ $(MODPERL_CP) $(MODPERL_LIB_DSO) $(DESTDIR)$(MODPERL_AP_LIBEXECDIR)
EOI
}
$install .= <<'EOI';
# install mod_perl .h files
- @$(MKPATH) $(MODPERL_AP_INCLUDEDIR)
- $(MODPERL_CP) $(MODPERL_H_FILES) $(MODPERL_AP_INCLUDEDIR)
+ @$(MKPATH) $(DESTDIR)$(MODPERL_AP_INCLUDEDIR)
+ $(MODPERL_CP) $(MODPERL_H_FILES) $(DESTDIR)$(MODPERL_AP_INCLUDEDIR)
EOI
my $mf = $self->default_file('makefile');
diff -Naur mod_perl-2.0.0-RC5/Makefile.PL mod_perl-2.0.0-RC5.new/Makefile.PL
--- mod_perl-2.0.0-RC5/Makefile.PL 2005-04-14 14:18:01.000000000 +0200
+++ mod_perl-2.0.0-RC5.new/Makefile.PL 2005-04-19 18:57:08.516387123 +0200
@@ -628,7 +628,7 @@
cd "$build->{MP_AP_PREFIX}" && make
ap_install: ap_build
- cd "$build->{MP_AP_PREFIX}" && make install
+ cd "$build->{MP_AP_PREFIX}" && make DESTDIR=$(DESTDIR) install
EOF
}
@@ -652,11 +652,11 @@
cd "$(MODPERL_SRC)" && $(MAKE)
modperl_lib_install:
- cd "$(MODPERL_SRC)" && $(MAKE) install
+ cd "$(MODPERL_SRC)" && $(MAKE) DESTDIR=$(DESTDIR) install
modperl_xs_h_install:
- @$(MKPATH) $(MODPERL_AP_INCLUDEDIR)
- $(CP) $(MODPERL_XS_H_FILES) $(MODPERL_AP_INCLUDEDIR)
+ @$(MKPATH) $(DESTDIR)$(MODPERL_AP_INCLUDEDIR)
+ $(CP) $(MODPERL_XS_H_FILES) $(DESTDIR)$(MODPERL_AP_INCLUDEDIR)
modperl_src_clean:
cd "$(MODPERL_SRC)" && $(MAKE) clean
pgpP0iEIWRXc6.pgp
Description: PGP signature
