On Tue, Apr 02, 2002 at 10:29:57AM -0600, Dave Rolsky wrote:
> And all I'm suggesting is that because there is no other way to do this
> stuff, that when you change the text in the generated Makefile, that you
> at least document that it has changed, so people can test their ugly hacks
> against the new version.
Trouble is I'm touching everything in lots of little (and sometimes
big, as with the test* and manify* targets) ways and on lots of
different platforms. Keeping a running log of all that is touched
will rapidly become a list of all targets generated by MakeMaker.
For a fun exercise, generate a Makefile using 5.6.1's MakeMaker and
then one using MM from CVS. Diff them. List all the targets and
macros which have changed. Such a diff is attached for your
edutainment. :)
Worse yet, just because something hasn't changed in the current
version doesn't mean you can rely on it not changing in the next. It
would just provide a false sense of forward-compatible security.
The best way people can test their hacks against the new version is by
just trying the new version. If something breaks because a make
fragment changed we'll come up with a safer way for the module author
to do it that's also backwards compatible.
I keep a list of CPAN modules handy with a high MM hackery value and
beat new versions of MakeMaker with it. So far it's short fairly short:
PDL
WxPerl
HTML::Mason
Alzabo
(the last two being just added) but those are some very complex
modules. I will also be hitting it with the EssentialModules list on
the perl-qa Wiki before a public release.
--
Michael G. Schwern <[EMAIL PROTECTED]> http://www.pobox.com/~schwern/
Perl Quality Assurance <[EMAIL PROTECTED]> Kwalitee Is Job One
i need another hit
just gimme some fucking paste
please, it hurts so bad
-- Fmh
--- /tmp/Makefile.5.6.1 Tue Apr 2 12:06:20 2002
+++ /tmp/Makefile.CVS Tue Apr 2 12:48:17 2002
@@ -1,42 +1,42 @@
# This Makefile is for the Test::Harness extension to perl.
#
# It was generated automatically by MakeMaker version
-# 5.45 (Revision: 1.222) from the contents of
+# 5.55_01 (Revision: 1.31) from the contents of
# Makefile.PL. Don't edit this file, edit Makefile.PL instead.
#
-# ANY CHANGES MADE HERE WILL BE LOST!
+# ANY CHANGES MADE HERE WILL BE LOST!
#
# MakeMaker ARGV: ()
#
# MakeMaker Parameters:
-# INSTALLDIRS => q[perl]
-# NAME => q[Test::Harness]
-# PREREQ_PM => { }
-# VERSION_FROM => q[lib/Test/Harness.pm]
+# INSTALLDIRS => q[perl]
+# NAME => q[Test::Harness]
+# PREREQ_PM => { }
+# VERSION_FROM => q[lib/Test/Harness.pm]
# --- MakeMaker post_initialize section:
# --- MakeMaker const_config section:
-# These definitions are from config.sh (via
/usr/local/perl5.6.1/lib/5.6.1/ppc-linux-64int/Config.pm)
+# These definitions are from config.sh (via /usr/lib/perl/5.6.1/Config.pm)
# They may have been overridden via Makefile.PL or on the command line
AR = ar
CC = cc
-CCCDLFLAGS = -fpic
+CCCDLFLAGS = -fPIC
CCDLFLAGS = -rdynamic
DLEXT = so
DLSRC = dl_dlopen.xs
LD = cc
LDDLFLAGS = -shared -L/usr/local/lib
LDFLAGS = -L/usr/local/lib
-LIBC = /lib/libc-2.2.5.so
+LIBC = /lib/libc-2.2.4.so
LIB_EXT = .a
OBJ_EXT = .o
OSNAME = linux
-OSVERS = 2.4.19-pre4-ben0
+OSVERS = 2.4.17-rc1-ben0+xfs
RANLIB = :
SO = so
EXE_EXT =
@@ -52,30 +52,36 @@
VERSION_SYM = 2_02
XS_VERSION = 2.02
INST_BIN = blib/bin
-INST_EXE = blib/script
INST_LIB = blib/lib
INST_ARCHLIB = blib/arch
INST_SCRIPT = blib/script
-PREFIX = /usr/local/perl5.6.1
+PREFIX = /usr
INSTALLDIRS = perl
-INSTALLPRIVLIB = $(PREFIX)/lib/5.6.1
-INSTALLARCHLIB = $(PREFIX)/lib/5.6.1/ppc-linux-64int
-INSTALLSITELIB = $(PREFIX)/lib/site_perl/5.6.1
-INSTALLSITEARCH = $(PREFIX)/lib/site_perl/5.6.1/ppc-linux-64int
+INSTALLPRIVLIB = /usr/share/perl/5.6.1
+INSTALLARCHLIB = /usr/lib/perl/5.6.1
+INSTALLSITELIB = /usr/local/share/perl/5.6.1
+INSTALLSITEARCH = /usr/local/lib/perl/5.6.1
INSTALLBIN = $(PREFIX)/bin
INSTALLSCRIPT = $(PREFIX)/bin
-PERL_LIB = /usr/local/perl5.6.1/lib/5.6.1
-PERL_ARCHLIB = /usr/local/perl5.6.1/lib/5.6.1/ppc-linux-64int
-SITELIBEXP = /usr/local/perl5.6.1/lib/site_perl/5.6.1
-SITEARCHEXP = /usr/local/perl5.6.1/lib/site_perl/5.6.1/ppc-linux-64int
+PERL_LIB = /usr/share/perl/5.6.1
+PERL_ARCHLIB = /usr/lib/perl/5.6.1
+SITELIBEXP = /usr/local/share/perl/5.6.1
+SITEARCHEXP = /usr/local/lib/perl/5.6.1
LIBPERL_A = libperl.a
FIRST_MAKEFILE = Makefile
MAKE_APERL_FILE = Makefile.aperl
PERLMAINCC = $(CC)
-PERL_INC = /usr/local/perl5.6.1/lib/5.6.1/ppc-linux-64int/CORE
-PERL = /usr/local/bin/perl5.6.1
-FULLPERL = /usr/local/bin/perl5.6.1
+PERL_INC = /usr/lib/perl/5.6.1/CORE
+PERL = /usr/local/bin/perl
+FULLPERL = /usr/local/bin/perl
+PERLRUN = $(PERL)
+FULLPERLRUN = $(FULLPERL)
+PERLRUNINST = $(PERLRUN) "-I$(INST_ARCHLIB)" "-I$(INST_LIB)"
+FULLPERLRUNINST = $(PERLRUN) "-I$(INST_ARCHLIB)" "-I$(INST_LIB)"
FULL_AR = /usr/bin/ar
+PERL_CORE = 0
+NOOP = $(SHELL) -c true
+NOECHO = @
VERSION_MACRO = VERSION
DEFINE_VERSION = -D$(VERSION_MACRO)=\"$(VERSION)\"
@@ -83,12 +89,11 @@
XS_DEFINE_VERSION = -D$(XS_VERSION_MACRO)=\"$(XS_VERSION)\"
PERL_MALLOC_DEF = -DPERL_EXTMALLOC_DEF -Dmalloc=Perl_malloc -Dfree=Perl_mfree
-Drealloc=Perl_realloc -Dcalloc=Perl_calloc
-MAKEMAKER = /usr/local/perl5.6.1/lib/5.6.1/ExtUtils/MakeMaker.pm
-MM_VERSION = 5.45
+MAKEMAKER = /usr/share/perl/5.6.1/ExtUtils/MakeMaker.pm
+MM_VERSION = 5.55_01
# FULLEXT = Pathname for extension directory (eg Foo/Bar/Oracle).
# BASEEXT = Basename part of FULLEXT. May be just equal FULLEXT. (eg Oracle)
-# ROOTEXT = Directory part of FULLEXT with leading slash (eg /DBD) !!! Deprecated
from MM 5.32 !!!
# PARENT_NAME = NAME without BASEEXT and no trailing :: (eg Foo::Bar)
# DLBASE = Basename part of dynamic library. May be just equal BASEEXT.
FULLEXT = Test/Harness
@@ -105,27 +110,24 @@
C_FILES =
O_FILES =
H_FILES =
-HTMLLIBPODS =
-HTMLSCRIPTPODS =
MAN1PODS =
MAN3PODS = lib/Test/Harness.pm \
lib/Test/Harness/Assert.pm \
lib/Test/Harness/Iterator.pm \
lib/Test/Harness/Straps.pm
-HTMLEXT = html
INST_MAN1DIR = blib/man1
-INSTALLMAN1DIR = $(PREFIX)/man/man1
-MAN1EXT = 1
+INSTALLMAN1DIR = /usr/share/man/man1
+MAN1EXT = 1p
INST_MAN3DIR = blib/man3
-INSTALLMAN3DIR = $(PREFIX)/man/man3
-MAN3EXT = 3
+INSTALLMAN3DIR = /usr/share/man/man3
+MAN3EXT = 3pm
PERM_RW = 644
PERM_RWX = 755
# work around a famous dec-osf make(1) feature(?):
makemakerdflt: all
-.SUFFIXES: .xs .c .C .cpp .cxx .cc $(OBJ_EXT)
+.SUFFIXES: .xs .c .C .cpp .i .s .cxx .cc $(OBJ_EXT)
# Nick wanted to get rid of .PRECIOUS. I don't remember why. I seem to recall, that
# some make implementations will delete the Makefile when we rebuild it. Because
@@ -156,27 +158,24 @@
PERL_ARCHIVE_AFTER =
TO_INST_PM = lib/Test/Harness.pm \
- lib/Test/Harness.pm~ \
lib/Test/Harness/Assert.pm \
lib/Test/Harness/Iterator.pm \
lib/Test/Harness/Straps.pm
PM_TO_BLIB = lib/Test/Harness/Assert.pm \
- $(INST_LIB)/Test/Harness/Assert.pm \
+ blib/lib/Test/Harness/Assert.pm \
lib/Test/Harness.pm \
- $(INST_LIB)/Test/Harness.pm \
+ blib/lib/Test/Harness.pm \
lib/Test/Harness/Iterator.pm \
- $(INST_LIB)/Test/Harness/Iterator.pm \
+ blib/lib/Test/Harness/Iterator.pm \
lib/Test/Harness/Straps.pm \
- $(INST_LIB)/Test/Harness/Straps.pm \
- lib/Test/Harness.pm~ \
- $(INST_LIB)/Test/Harness.pm~
+ blib/lib/Test/Harness/Straps.pm
# --- MakeMaker tool_autosplit section:
-
# Usage: $(AUTOSPLITFILE) FileToSplit AutoDirToSplitInto
-AUTOSPLITFILE = $(PERL) "-I$(PERL_ARCHLIB)" "-I$(PERL_LIB)" -e 'use
AutoSplit;autosplit($$ARGV[0], $$ARGV[1], 0, 1, 1) ;'
+AUTOSPLITFILE = $(PERLRUN) -e 'use AutoSplit; autosplit($$ARGV[0], $$ARGV[1], 0, 1,
+1) ;'
+
# --- MakeMaker tool_xsubpp section:
@@ -199,13 +198,13 @@
# The following is a portable way to say mkdir -p
# To see which directories are created, change the if 0 to if 1
-MKPATH = $(PERL) -I$(PERL_ARCHLIB) -I$(PERL_LIB) -MExtUtils::Command -e mkpath
+MKPATH = $(PERLRUN) "-MExtUtils::Command" -e mkpath
# This helps us to minimize the effect of the .exists files A yet
# better solution would be to have a stable file in the perl
# distribution with a timestamp of zero. But this solution doesn't
# need any changes to the core distribution and works with older perls
-EQUALIZE_TIMESTAMP = $(PERL) -I$(PERL_ARCHLIB) -I$(PERL_LIB) -MExtUtils::Command -e
eqtime
+EQUALIZE_TIMESTAMP = $(PERLRUN) "-MExtUtils::Command" -e eqtime
# Here we warn users that an old packlist file was found somewhere,
# and that they should call some uninstall routine
@@ -217,7 +216,7 @@
UNINST=0
VERBINST=0
-MOD_INSTALL = $(PERL) -I$(INST_LIB) -I$(PERL_LIB) -MExtUtils::Install \
+MOD_INSTALL = $(PERL) "-I$(INST_LIB)" "-I$(PERL_LIB)" "-MExtUtils::Install" \
-e "install({@ARGV},'$(VERBINST)',0,'$(UNINST)');"
DOC_INSTALL = $(PERL) -e '$$\="\n\n";' \
@@ -226,29 +225,28 @@
-e 'while (defined($$key = shift) and defined($$val = shift)){print "=item *";print
"C<$$key: $$val>";}' \
-e 'print "=back";'
-UNINSTALL = $(PERL) -MExtUtils::Install \
+UNINSTALL = $(PERLRUN) "-MExtUtils::Install" \
-e 'uninstall($$ARGV[0],1,1); print "\nUninstall is deprecated. Please check the";' \
-e 'print " packlist above carefully.\n There may be errors. Remove the";' \
-e 'print " appropriate files manually.\n Sorry for the inconveniences.\n"'
# --- MakeMaker dist section:
-
-DISTVNAME = $(DISTNAME)-$(VERSION)
-TAR = tar
-TARFLAGS = cvf
-ZIP = zip
-ZIPFLAGS = -r
-COMPRESS = gzip --best
-SUFFIX = .gz
-SHAR = shar
-PREOP = @$(NOOP)
+DIST_DEFAULT = tardist
POSTOP = @$(NOOP)
-TO_UNIX = @$(NOOP)
+PREOP = @$(NOOP)
+SHAR = shar
+COMPRESS = gzip --best
CI = ci -u
-RCS_LABEL = rcs -Nv$(VERSION_SYM): -q
+ZIPFLAGS = -r
DIST_CP = best
-DIST_DEFAULT = tardist
+DISTVNAME = $(DISTNAME)-$(VERSION)
+ZIP = zip
+TARFLAGS = cvf
+TAR = tar
+RCS_LABEL = rcs -Nv$(VERSION_SYM): -q
+TO_UNIX = @$(NOOP)
+SUFFIX = .gz
# --- MakeMaker macro section:
@@ -275,7 +273,9 @@
LIBPERL_A="$(LIBPERL_A)"\
LINKTYPE="$(LINKTYPE)"\
PREFIX="$(PREFIX)"\
- OPTIMIZE="$(OPTIMIZE)"
+ OPTIMIZE="$(OPTIMIZE)"\
+ PASTHRU_DEFINE="$(PASTHRU_DEFINE)"\
+ PASTHRU_INC="$(PASTHRU_INC)"
# --- MakeMaker c_o section:
@@ -289,9 +289,7 @@
# --- MakeMaker top_targets section:
-#all :: config $(INST_PM) subdirs linkext manifypods
-
-all :: pure_all htmlifypods manifypods
+all :: pure_all manifypods
@$(NOOP)
pure_all :: config pm_to_blib subdirs linkext
@@ -309,21 +307,21 @@
config :: $(INST_AUTODIR)/.exists
@$(NOOP)
-$(INST_AUTODIR)/.exists :: /usr/local/perl5.6.1/lib/5.6.1/ppc-linux-64int/CORE/perl.h
+$(INST_AUTODIR)/.exists :: /usr/lib/perl/5.6.1/CORE/perl.h
@$(MKPATH) $(INST_AUTODIR)
- @$(EQUALIZE_TIMESTAMP)
/usr/local/perl5.6.1/lib/5.6.1/ppc-linux-64int/CORE/perl.h $(INST_AUTODIR)/.exists
+ @$(EQUALIZE_TIMESTAMP) /usr/lib/perl/5.6.1/CORE/perl.h $(INST_AUTODIR)/.exists
-@$(CHMOD) $(PERM_RWX) $(INST_AUTODIR)
-$(INST_LIBDIR)/.exists :: /usr/local/perl5.6.1/lib/5.6.1/ppc-linux-64int/CORE/perl.h
+$(INST_LIBDIR)/.exists :: /usr/lib/perl/5.6.1/CORE/perl.h
@$(MKPATH) $(INST_LIBDIR)
- @$(EQUALIZE_TIMESTAMP)
/usr/local/perl5.6.1/lib/5.6.1/ppc-linux-64int/CORE/perl.h $(INST_LIBDIR)/.exists
+ @$(EQUALIZE_TIMESTAMP) /usr/lib/perl/5.6.1/CORE/perl.h $(INST_LIBDIR)/.exists
-@$(CHMOD) $(PERM_RWX) $(INST_LIBDIR)
-$(INST_ARCHAUTODIR)/.exists ::
/usr/local/perl5.6.1/lib/5.6.1/ppc-linux-64int/CORE/perl.h
+$(INST_ARCHAUTODIR)/.exists :: /usr/lib/perl/5.6.1/CORE/perl.h
@$(MKPATH) $(INST_ARCHAUTODIR)
- @$(EQUALIZE_TIMESTAMP)
/usr/local/perl5.6.1/lib/5.6.1/ppc-linux-64int/CORE/perl.h $(INST_ARCHAUTODIR)/.exists
+ @$(EQUALIZE_TIMESTAMP) /usr/lib/perl/5.6.1/CORE/perl.h
+$(INST_ARCHAUTODIR)/.exists
-@$(CHMOD) $(PERM_RWX) $(INST_ARCHAUTODIR)
@@ -331,20 +329,15 @@
@$(NOOP)
-$(INST_MAN3DIR)/.exists :: /usr/local/perl5.6.1/lib/5.6.1/ppc-linux-64int/CORE/perl.h
+$(INST_MAN3DIR)/.exists :: /usr/lib/perl/5.6.1/CORE/perl.h
@$(MKPATH) $(INST_MAN3DIR)
- @$(EQUALIZE_TIMESTAMP)
/usr/local/perl5.6.1/lib/5.6.1/ppc-linux-64int/CORE/perl.h $(INST_MAN3DIR)/.exists
+ @$(EQUALIZE_TIMESTAMP) /usr/lib/perl/5.6.1/CORE/perl.h $(INST_MAN3DIR)/.exists
-@$(CHMOD) $(PERM_RWX) $(INST_MAN3DIR)
help:
perldoc ExtUtils::MakeMaker
-Version_check:
- @$(PERL) -I$(PERL_ARCHLIB) -I$(PERL_LIB) \
- -MExtUtils::MakeMaker=Version_check \
- -e "Version_check('$(MM_VERSION)')"
-
# --- MakeMaker linkext section:
@@ -384,18 +377,12 @@
# --- MakeMaker static_lib section:
-# --- MakeMaker htmlifypods section:
-
-htmlifypods : pure_all
- @$(NOOP)
-
-
# --- MakeMaker manifypods section:
-POD2MAN_EXE = /usr/local/perl5.6.1/bin/pod2man
+POD2MAN_EXE = /usr/bin/pod2man
POD2MAN = $(PERL) -we '%m=@ARGV;for (keys %m){' \
-e 'next if -e $$m{$$_} && -M $$m{$$_} < -M $$_ && -M $$m{$$_} < -M "Makefile";' \
-e 'print "Manifying $$m{$$_}\n";' \
--e 'system(qq[$$^X ].q["-I$(PERL_ARCHLIB)" "-I$(PERL_LIB)" $(POD2MAN_EXE)
].qq[$$_>$$m{$$_}])==0 or warn "Couldn\047t install $$m{$$_}\n";' \
+-e 'system(q[$(PERLRUN) $(POD2MAN_EXE) ].qq[$$_>$$m{$$_}])==0 or warn "Couldn\047t
+install $$m{$$_}\n";' \
-e 'chmod(oct($(PERM_RW))), $$m{$$_} or warn "chmod $(PERM_RW) $$m{$$_}: $$!\n";}'
manifypods : pure_all lib/Test/Harness/Assert.pm \
@@ -428,7 +415,7 @@
# the Makefile here so a later make realclean still has a makefile to use.
clean ::
- -rm -rf ./blib $(MAKE_APERL_FILE) $(INST_ARCHAUTODIR)/extralibs.all perlmain.c
mon.out core core.*perl.*.? *perl.core so_locations pm_to_blib *$(OBJ_EXT) *$(LIB_EXT)
perl.exe $(BOOTSTRAP) $(BASEEXT).bso $(BASEEXT).def $(BASEEXT).exp
+ -rm -rf ./blib $(MAKE_APERL_FILE) $(INST_ARCHAUTODIR)/extralibs.all perlmain.c
+tmon.out mon.out so_locations pm_to_blib *$(OBJ_EXT) *$(LIB_EXT) perl.exe perl
+perl$(EXE_EXT) $(BOOTSTRAP) $(BASEEXT).bso $(BASEEXT).def lib$(BASEEXT).def
+$(BASEEXT).exp $(BASEEXT).x core core.*perl.*.? *perl.core
-mv Makefile Makefile.old $(DEV_NULL)
@@ -437,32 +424,30 @@
# Delete temporary files (via clean) and also delete installed files
realclean purge :: clean
rm -rf $(INST_AUTODIR) $(INST_ARCHAUTODIR)
- rm -f $(INST_LIB)/Test/Harness/Assert.pm $(INST_LIB)/Test/Harness.pm
- rm -f $(INST_LIB)/Test/Harness/Iterator.pm $(INST_LIB)/Test/Harness/Straps.pm
- rm -f $(INST_LIB)/Test/Harness.pm~
+ rm -rf $(DISTVNAME)
+ rm -f blib/lib/Test/Harness/Assert.pm blib/lib/Test/Harness.pm
+ rm -f blib/lib/Test/Harness/Iterator.pm blib/lib/Test/Harness/Straps.pm
rm -rf Makefile Makefile.old
# --- MakeMaker dist_basics section:
-
distclean :: realclean distcheck
+ $(NOECHO) $(NOOP)
distcheck :
- $(PERL) -I$(PERL_ARCHLIB) -I$(PERL_LIB) -MExtUtils::Manifest=fullcheck \
- -e fullcheck
+ $(PERLRUN) "-MExtUtils::Manifest=fullcheck" -e fullcheck
skipcheck :
- $(PERL) -I$(PERL_ARCHLIB) -I$(PERL_LIB) -MExtUtils::Manifest=skipcheck \
- -e skipcheck
+ $(PERLRUN) "-MExtUtils::Manifest=skipcheck" -e skipcheck
manifest :
- $(PERL) -I$(PERL_ARCHLIB) -I$(PERL_LIB) -MExtUtils::Manifest=mkmanifest \
- -e mkmanifest
+ $(PERLRUN) "-MExtUtils::Manifest=mkmanifest" -e mkmanifest
veryclean : realclean
$(RM_F) *~ *.orig */*~ */*.orig
+
# --- MakeMaker dist_core section:
dist : $(DIST_DEFAULT)
@@ -500,17 +485,17 @@
# --- MakeMaker dist_dir section:
-
distdir :
$(RM_RF) $(DISTVNAME)
- $(PERL) -I$(PERL_ARCHLIB) -I$(PERL_LIB) -MExtUtils::Manifest=manicopy,maniread
\
+ $(PERLRUN) "-MExtUtils::Manifest=manicopy,maniread" \
-e "manicopy(maniread(),'$(DISTVNAME)', '$(DIST_CP)');"
+
# --- MakeMaker dist_test section:
disttest : distdir
- cd $(DISTVNAME) && $(PERL) -I$(PERL_ARCHLIB) -I$(PERL_LIB) Makefile.PL
+ cd $(DISTVNAME) && $(PERLRUN) Makefile.PL
cd $(DISTVNAME) && $(MAKE)
cd $(DISTVNAME) && $(MAKE) test
@@ -518,7 +503,7 @@
# --- MakeMaker dist_ci section:
ci :
- $(PERL) -I$(PERL_ARCHLIB) -I$(PERL_LIB) -MExtUtils::Manifest=maniread \
+ $(PERLRUN) "-MExtUtils::Manifest=maniread" \
-e "@all = keys %{ maniread() };" \
-e 'print("Executing $(CI) @all\n"); system("$(CI) @all");' \
-e 'print("Executing $(RCS_LABEL) ...\n"); system("$(RCS_LABEL)
@all");'
@@ -532,9 +517,6 @@
install_site :: all pure_site_install doc_site_install
-install_ :: install_site
- @echo INSTALLDIRS not defined, defaulting to INSTALLDIRS=site
-
pure_install :: pure_$(INSTALLDIRS)_install
doc_install :: doc_$(INSTALLDIRS)_install
@@ -554,8 +536,6 @@
$(INST_ARCHLIB) $(INSTALLARCHLIB) \
$(INST_BIN) $(INSTALLBIN) \
$(INST_SCRIPT) $(INSTALLSCRIPT) \
- $(INST_HTMLLIBDIR) $(INSTALLHTMLPRIVLIBDIR) \
- $(INST_HTMLSCRIPTDIR) $(INSTALLHTMLSCRIPTDIR) \
$(INST_MAN1DIR) $(INSTALLMAN1DIR) \
$(INST_MAN3DIR) $(INSTALLMAN3DIR)
@$(WARN_IF_OLD_PACKLIST) \
@@ -570,8 +550,6 @@
$(INST_ARCHLIB) $(INSTALLSITEARCH) \
$(INST_BIN) $(INSTALLBIN) \
$(INST_SCRIPT) $(INSTALLSCRIPT) \
- $(INST_HTMLLIBDIR) $(INSTALLHTMLSITELIBDIR) \
- $(INST_HTMLSCRIPTDIR) $(INSTALLHTMLSCRIPTDIR) \
$(INST_MAN1DIR) $(INSTALLMAN1DIR) \
$(INST_MAN3DIR) $(INSTALLMAN3DIR)
@$(WARN_IF_OLD_PACKLIST) \
@@ -626,7 +604,7 @@
-@$(RM_F) Makefile.old
-@$(MV) Makefile Makefile.old
-$(MAKE) -f Makefile.old clean $(DEV_NULL) || $(NOOP)
- $(PERL) "-I$(PERL_ARCHLIB)" "-I$(PERL_LIB)" Makefile.PL
+ $(PERLRUN) Makefile.PL
@echo "==> Your Makefile has been rebuilt. <=="
@echo "==> Please rerun the make command. <=="
false
@@ -641,14 +619,14 @@
# --- MakeMaker makeaperl section ---
MAP_TARGET = perl
-FULLPERL = /usr/local/bin/perl5.6.1
+FULLPERL = /usr/local/bin/perl
$(MAP_TARGET) :: static $(MAKE_APERL_FILE)
$(MAKE) -f $(MAKE_APERL_FILE) $@
$(MAKE_APERL_FILE) : $(FIRST_MAKEFILE)
@echo Writing \"$(MAKE_APERL_FILE)\" for this $(MAP_TARGET)
- @$(PERL) -I$(INST_ARCHLIB) -I$(INST_LIB) -I$(PERL_ARCHLIB) -I$(PERL_LIB) \
+ @$(PERLRUNINST) \
Makefile.PL DIR= \
MAKEFILE=$(MAKE_APERL_FILE) LINKTYPE=static \
MAKEAPERL=1 NORECURS=1 CCCDLFLAGS=
@@ -667,10 +645,10 @@
test :: $(TEST_TYPE)
test_dynamic :: pure_all
- PERL_DL_NONLAZY=1 $(FULLPERL) -I$(INST_ARCHLIB) -I$(INST_LIB) -e 'use
Test::Harness qw(&runtests $$verbose); $$verbose=$(TEST_VERBOSE); runtests @ARGV;'
$(TEST_FILES)
+ PERL_DL_NONLAZY=1 $(FULLPERLRUN) "-MExtUtils::Command::MM" "-e"
+"test_harness($(TEST_VERBOSE), '$(INST_LIB)', '$(INST_ARCHLIB)')" $(TEST_FILES)
testdb_dynamic :: pure_all
- PERL_DL_NONLAZY=1 $(FULLPERL) $(TESTDB_SW) -I$(INST_ARCHLIB) -I$(INST_LIB)
-I$(PERL_ARCHLIB) -I$(PERL_LIB) $(TEST_FILE)
+ PERL_DL_NONLAZY=1 $(FULLPERLRUN) $(TESTDB_SW) "-I$(INST_LIB)" "-I$(INST_ARCH)"
+$(TEST_FILE)
test_ : test_dynamic
@@ -681,16 +659,18 @@
# --- MakeMaker ppd section:
# Creates a PPD (Perl Package Description) for a binary distribution.
ppd:
- @$(PERL) -e "print qq{<SOFTPKG NAME=\"Test-Harness\" VERSION=\"2,02,0,0\">\n}.
qq{\t<TITLE>Test-Harness</TITLE>\n}. qq{\t<ABSTRACT></ABSTRACT>\n}.
qq{\t<AUTHOR></AUTHOR>\n}. qq{\t<IMPLEMENTATION>\n}. qq{\t\t<OS NAME=\"$(OSNAME)\"
/>\n}. qq{\t\t<ARCHITECTURE NAME=\"ppc-linux-64int\" />\n}. qq{\t\t<CODEBASE HREF=\"\"
/>\n}. qq{\t</IMPLEMENTATION>\n}. qq{</SOFTPKG>\n}" > Test-Harness.ppd
+ @$(PERL) -e "print qq{<SOFTPKG NAME=\"$(DISTNAME)\"
+VERSION=\"2,02,0,0\">\n\t<TITLE>$(DISTNAME)</TITLE>\n\t<ABSTRACT></ABSTRACT>\n\t<AUTHOR></AUTHOR>\n}"
+ > $(DISTNAME).ppd
+ @$(PERL) -e "print qq{\t<IMPLEMENTATION>\n}" >> $(DISTNAME).ppd
+ @$(PERL) -e "print qq{\t\t<OS NAME=\"$(OSNAME)\" />\n\t\t<ARCHITECTURE
+NAME=\"powerpc-linux\" />\n\t\t<CODEBASE HREF=\"\"
+/>\n\t</IMPLEMENTATION>\n</SOFTPKG>\n}" >> $(DISTNAME).ppd
# --- MakeMaker pm_to_blib section:
pm_to_blib: $(TO_INST_PM)
- @$(PERL) "-I$(INST_ARCHLIB)" "-I$(INST_LIB)" \
- "-I$(PERL_ARCHLIB)" "-I$(PERL_LIB)" -MExtUtils::Install \
- -e "pm_to_blib({qw{$(PM_TO_BLIB)}},'$(INST_LIB)/auto','$(PM_FILTER)')"
+ @$(PERLRUNINST) "-MExtUtils::Install" \
+ -e "pm_to_blib({qw{lib/Test/Harness.pm blib/lib/Test/Harness.pm
+lib/Test/Harness/Assert.pm blib/lib/Test/Harness/Assert.pm
+lib/Test/Harness/Iterator.pm
+blib/lib/Test/Harness/Iterator.pm}},'$(INST_LIB)/auto','$(PM_FILTER)')"
+ @$(PERLRUNINST) "-MExtUtils::Install" \
+ -e "pm_to_blib({qw{lib/Test/Harness/Straps.pm
+blib/lib/Test/Harness/Straps.pm}},'$(INST_LIB)/auto','$(PM_FILTER)')"
@$(TOUCH) $@
-
# --- MakeMaker selfdocument section:
