dougm 02/05/21 18:59:00
Modified: . Makefile.PL
lib/Apache Build.pm
Log:
make it possible to change the name of src/modules/perl/Makefile
in case static build requires a src/modules/perl/Makefile.in
Revision Changes Path
1.82 +12 -8 modperl-2.0/Makefile.PL
Index: Makefile.PL
===================================================================
RCS file: /home/cvs/modperl-2.0/Makefile.PL,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- Makefile.PL 21 May 2002 16:19:51 -0000 1.81
+++ Makefile.PL 22 May 2002 01:58:59 -0000 1.82
@@ -23,6 +23,7 @@
use File::Spec::Functions;
use DirHandle ();
use File::Copy 'cp';
+use File::Basename 'basename';
use Apache::Build ();
use Apache::TestReportPerl ();
@@ -70,11 +71,14 @@
VERSION => $VERSION,
DIR => get_dirs_with_makefile(@remote_makefile_dirs),
macro => {
- MODPERL_SRC => $code->path,
- PERL => $build->perl_config('perlpath'),
- MOD_INSTALL => ModPerl::MM::mod_install(),
- APACHE_PREFIX => $build->apxs('-q' => 'prefix'),
- APACHE_LIBDIR => $build->apxs('-q' => 'libexecdir'),
+ MODPERL_SRC => $code->path,
+ MODPERL_MAKEFILE => basename($build->default_file('makefile')),
+ MAKE_F => '$(MAKE) ' . (WIN32 ? '/f' : '-f'),
+ MODPERL_LIBMAKE => '$(MAKE) -f $(MODPERL_MAKEFILE)',
+ PERL => $build->perl_config('perlpath'),
+ MOD_INSTALL => ModPerl::MM::mod_install(),
+ APACHE_PREFIX => $build->apxs('-q' => 'prefix'),
+ APACHE_LIBDIR => $build->apxs('-q' => 'libexecdir'),
},
clean => {
FILES => "@{ clean_files() }",
@@ -390,13 +394,13 @@
$(SHELL) build/make_etags
modperl_lib:
- cd "$(MODPERL_SRC)" && $(MAKE)
+ cd "$(MODPERL_SRC)" && $(MODPERL_LIBMAKE)
modperl_lib_install:
- cd "$(MODPERL_SRC)" && $(MAKE) install
+ cd "$(MODPERL_SRC)" && $(MODPERL_LIBMAKE) install
modperl_src_clean:
- cd "$(MODPERL_SRC)" && $(MAKE) clean
+ cd "$(MODPERL_SRC)" && $(MODPERL_LIBMAKE) clean
EOF
1.91 +6 -3 modperl-2.0/lib/Apache/Build.pm
Index: Build.pm
===================================================================
RCS file: /home/cvs/modperl-2.0/lib/Apache/Build.pm,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -r1.90 -r1.91
--- Build.pm 21 May 2002 17:42:39 -0000 1.90
+++ Build.pm 22 May 2002 01:58:59 -0000 1.91
@@ -9,6 +9,7 @@
use Config;
use Cwd ();
use File::Spec ();
+use File::Basename;
use ExtUtils::Embed ();
use ModPerl::Code ();
use ModPerl::BuildOptions ();
@@ -450,7 +451,7 @@
my %default_files = (
'build_config' => 'lib/Apache/BuildConfig.pm',
'ldopts' => 'src/modules/perl/ldopts',
- 'makefile' => 'src/modules/perl/Makefile',
+ 'makefile' => 'src/modules/perl/Makefile.modperl',
);
sub clean_files {
@@ -908,6 +909,8 @@
print $fh noedit_warning_hash();
+ print $fh $self->canon_make_attr('makefile', basename $mf);
+
$self->make_tools($fh);
print $fh $self->canon_make_attr('ap_libs', $self->apache_libs);
@@ -1006,8 +1009,8 @@
$(MODPERL_CLEAN_FILES) \
$(MODPERL_XS_CLEAN_FILES)
-$(MODPERL_OBJS): $(MODPERL_H_FILES) Makefile
-$(MODPERL_PIC_OBJS): $(MODPERL_H_FILES) Makefile
+$(MODPERL_OBJS): $(MODPERL_H_FILES) $(MODPERL_MAKEFILE)
+$(MODPERL_PIC_OBJS): $(MODPERL_H_FILES) $(MODPERL_MAKEFILE)
$(MODPERL_LIB): $(MODPERL_LIBPERL)
$(MODPERL_LIBNAME)$(MODPERL_LIB_EXT): $(MODPERL_OBJS)
