Return-Path: Delivered-To: apmail-perl-modperl-cvs-archive@www.apache.org Received: (qmail 55723 invoked from network); 11 Sep 2004 00:07:35 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur-2.apache.org with SMTP; 11 Sep 2004 00:07:35 -0000 Received: (qmail 44646 invoked by uid 500); 11 Sep 2004 00:07:35 -0000 Delivered-To: apmail-perl-modperl-cvs-archive@perl.apache.org Received: (qmail 44576 invoked by uid 500); 11 Sep 2004 00:07:35 -0000 Mailing-List: contact modperl-cvs-help@perl.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: list-post: Reply-To: dev@perl.apache.org Delivered-To: mailing list modperl-cvs@perl.apache.org Received: (qmail 44563 invoked by uid 500); 11 Sep 2004 00:07:34 -0000 Delivered-To: apmail-modperl-2.0-cvs@apache.org X-ASF-Spam-Status: No, hits=-2.8 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Date: 11 Sep 2004 00:07:33 -0000 Message-ID: <20040911000733.55711.qmail@minotaur.apache.org> From: gozer@apache.org To: modperl-2.0-cvs@apache.org Subject: cvs commit: modperl-2.0 Makefile.PL X-Virus-Checked: Checked X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N gozer 2004/09/10 17:07:33 Modified: src/modules/perl .cvsignore lib/Apache Build.pm . Makefile.PL Log: Build cleanup. src/modules/perl/Makefile.modperl was a special case prepared for the static build. It's not necessary anymore. Revision Changes Path 1.12 +0 -1 modperl-2.0/src/modules/perl/.cvsignore Index: .cvsignore =================================================================== RCS file: /home/cvs/modperl-2.0/src/modules/perl/.cvsignore,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- .cvsignore 26 May 2002 23:37:17 -0000 1.11 +++ .cvsignore 11 Sep 2004 00:07:33 -0000 1.12 @@ -9,7 +9,6 @@ modperl_xsinit.c ldopts Makefile -Makefile.modperl *.lo *.o *.a 1.174 +1 -1 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.173 retrieving revision 1.174 diff -u -r1.173 -r1.174 --- Build.pm 3 Sep 2004 13:02:39 -0000 1.173 +++ Build.pm 11 Sep 2004 00:07:33 -0000 1.174 @@ -763,7 +763,7 @@ my %default_files = ( 'build_config' => 'lib/Apache/BuildConfig.pm', 'ldopts' => 'src/modules/perl/ldopts', - 'makefile' => 'src/modules/perl/Makefile.modperl', + 'makefile' => 'src/modules/perl/Makefile', ); sub clean_files { 1.159 +3 -5 modperl-2.0/Makefile.PL Index: Makefile.PL =================================================================== RCS file: /home/cvs/modperl-2.0/Makefile.PL,v retrieving revision 1.158 retrieving revision 1.159 diff -u -r1.158 -r1.159 --- Makefile.PL 6 Sep 2004 15:52:28 -0000 1.158 +++ Makefile.PL 11 Sep 2004 00:07:33 -0000 1.159 @@ -74,8 +74,6 @@ macro => { 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::BuildMM::mod_install(), MODPERL_AP_INCLUDEDIR => $build->ap_includedir(), @@ -562,17 +560,17 @@ $(SHELL) build/make_etags modperl_lib: - cd "$(MODPERL_SRC)" && $(MODPERL_LIBMAKE) + cd "$(MODPERL_SRC)" && $(MAKE) modperl_lib_install: - cd "$(MODPERL_SRC)" && $(MODPERL_LIBMAKE) install + cd "$(MODPERL_SRC)" && $(MAKE) install modperl_xs_h_install: @$(MKPATH) $(MODPERL_AP_INCLUDEDIR) $(CP) $(MODPERL_XS_H_FILES) $(MODPERL_AP_INCLUDEDIR) modperl_src_clean: - cd "$(MODPERL_SRC)" && $(MODPERL_LIBMAKE) clean + cd "$(MODPERL_SRC)" && $(MAKE) clean EOF