You are viewing a plain text version of this content. The canonical link for it is here.
Posted to modperl-cvs@perl.apache.org by st...@apache.org on 2003/11/26 03:22:11 UTC
cvs commit: modperl Makefile.PL Changes
stas 2003/11/25 18:22:11
Modified: . Makefile.PL Changes
Log:
for some reason .pm files during the modperl build see $ENV{PERL5LIB}
set in Makefile.PL, which is used for generating Makefiles, as
"PERL5LIB=/path:/another/path" instead of "/path:/another/path"
essentially rendering this env var useless. I'm not sure why, may be
MakeMaker kicks in somewhere. Trying to workaround by
s/PERL5LIB/PERL5LIB_ENV/, using anything that's not PERL5LIB.
Revision Changes Path
1.219 +4 -4 modperl/Makefile.PL
Index: Makefile.PL
===================================================================
RCS file: /home/cvs/modperl/Makefile.PL,v
retrieving revision 1.218
retrieving revision 1.219
diff -u -u -r1.218 -r1.219
--- Makefile.PL 9 Oct 2003 05:10:29 -0000 1.218
+++ Makefile.PL 26 Nov 2003 02:22:10 -0000 1.219
@@ -1291,7 +1291,7 @@
HTTPD => $TARGET,
PORT => $PORT,
PWD => $PWD,
- PERL5LIB => "PERL5LIB=$ENV{PERL5LIB}",
+ PERL5LIB_ENV => "PERL5LIB=$ENV{PERL5LIB}",
SHRPENV => $Config{shrpenv},
CVSROOT => 'cvs.apache.org:/home/cvs',
},
@@ -1419,16 +1419,16 @@
(cd ./apaci && $(MAKE) distclean)
apxs_libperl:
- (cd ./apaci && $(PERL5LIB) $(MAKE))
+ (cd ./apaci && $(PERL5LIB_ENV) $(MAKE))
apxs_install: apxs_libperl
(cd ./apaci && $(MAKE) install;)
apache_httpd: $(APACHE_SRC)/Makefile.tmpl
- (cd $(APACHE_SRC) && $(PERL5LIB) $(SHRPENV) $(MAKE) CC="$(CC)";)
+ (cd $(APACHE_SRC) && $(PERL5LIB_ENV) $(SHRPENV) $(MAKE) CC="$(CC)";)
apaci_httpd:
- (cd $(APACHE_ROOT) && $(PERL5LIB) $(MAKE))
+ (cd $(APACHE_ROOT) && $(PERL5LIB_ENV) $(MAKE))
apaci_install:
(cd $(APACHE_ROOT) && $(MAKE) install)
1.686 +7 -0 modperl/Changes
Index: Changes
===================================================================
RCS file: /home/cvs/modperl/Changes,v
retrieving revision 1.685
retrieving revision 1.686
diff -u -u -r1.685 -r1.686
--- Changes 30 Oct 2003 19:51:38 -0000 1.685
+++ Changes 26 Nov 2003 02:22:11 -0000 1.686
@@ -10,6 +10,13 @@
=item 1.30_01-dev
+for some reason .pm files during the modperl build see $ENV{PERL5LIB}
+set in Makefile.PL, which is used for generating Makefiles, as
+"PERL5LIB=/path:/another/path" instead of "/path:/another/path"
+essentially rendering this env var useless. I'm not sure why, may be
+MakeMaker kicks in somewhere. Trying to workaround by
+s/PERL5LIB/PERL5LIB_ENV/, using anything that's not PERL5LIB. [Stas]
+
change $INC{$key} = undef; to delete $INC{$key}; in PerlFreshRestart
[Geoffrey Young]