Author: stas
Date: Wed Apr 20 10:34:22 2005
New Revision: 162027
URL: http://svn.apache.org/viewcvs?rev=162027&view=rev
Log:
restore the DESTDIR support partially nuked by the apache2 rename
branch
Modified:
perl/modperl/trunk/Changes
perl/modperl/trunk/Makefile.PL
perl/modperl/trunk/lib/Apache2/Build.pm
Modified: perl/modperl/trunk/Changes
URL:
http://svn.apache.org/viewcvs/perl/modperl/trunk/Changes?rev=162027&r1=162026&r2=162027&view=diff
==============================================================================
--- perl/modperl/trunk/Changes (original)
+++ perl/modperl/trunk/Changes Wed Apr 20 10:34:22 2005
@@ -12,6 +12,9 @@
=item 1.999_23-dev
+restore the DESTDIR support partially nuked by the apache2 rename
+branch [Torsten FÃrtsch <torsten.foertsch gmx.net>]
+
add APR::Status to provide functions corresponding to the
APR_STATUS_IS_* macros of apr_errno.h, especially those composites
like APR_STATUS_IS_EAGAIN(s) which are satisfied by more than one
Modified: perl/modperl/trunk/Makefile.PL
URL:
http://svn.apache.org/viewcvs/perl/modperl/trunk/Makefile.PL?rev=162027&r1=162026&r2=162027&view=diff
==============================================================================
--- perl/modperl/trunk/Makefile.PL (original)
+++ perl/modperl/trunk/Makefile.PL Wed Apr 20 10:34:22 2005
@@ -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
Modified: perl/modperl/trunk/lib/Apache2/Build.pm
URL:
http://svn.apache.org/viewcvs/perl/modperl/trunk/lib/Apache2/Build.pm?rev=162027&r1=162026&r2=162027&view=diff
==============================================================================
--- perl/modperl/trunk/lib/Apache2/Build.pm (original)
+++ perl/modperl/trunk/lib/Apache2/Build.pm Wed Apr 20 10:34:22 2005
@@ -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');
