From: Craig A. Berry Date: Sun, 13 Sep 2009 19:47:40 +0000 (-0500) Subject: Revert "Replace $(MINIPERL) -"I[-.lib]" with $(MINIPERL_UP)" X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=08da30e090ffe9d3e714e16caf823df36aa21107;p=p5sagit%2Fp5-mst-13.2.git Revert "Replace $(MINIPERL) -"I[-.lib]" with $(MINIPERL_UP)" This reverts commit 052792984b8f177f8f314261429d93930437fc49. We do actually need both -"I[.lib" and -"I[-.lib]" --- diff --git a/vms/descrip_mms.template b/vms/descrip_mms.template index 5310522..51fe818 100644 --- a/vms/descrip_mms.template +++ b/vms/descrip_mms.template @@ -242,7 +242,6 @@ NOOP = continue # are built using these macros should depend on $(MINIPERL_EXE) MINIPERL_EXE = Sys$Disk:[]miniperl$(E) MINIPERL = MCR $(MINIPERL_EXE) "-I[.lib]" -MINIPERLUP = MCR $(MINIPERL_EXE) "-I[-.lib]" MINIPERLQ = MCR $(MINIPERL_EXE) ""-I[.lib]"" XSUBPP = $(MINIPERL) "-I[.ext.re]" [.lib.extutils]xsubpp -noprototypes # Macro to invoke a preexisting copy of Perl. This is used to regenerate @@ -599,88 +598,88 @@ nonxsext : $(LIBPREREQ) preplibrary $(MINIPERL_EXE) [.lib.pods]perldoc.com : [.utils]perldoc.PL $(ARCHDIR)Config.pm @ If F$Search("[.lib]pods.dir").eqs."" Then Create/Directory [.lib.pods] - $(MINIPERL_UP) $(MMS$SOURCE) + $(MINIPERL) -"I[-.lib]" $(MMS$SOURCE) Copy/NoConfirm/Log [.utils]perldoc.com [.lib.pods] [.lib.ExtUtils]Miniperl.pm : Minimod.PL miniperlmain.c $(ARCHDIR)Config.pm - $(MINIPERL_UP) $(MMS$SOURCE) >$(MMS$TARGET) + $(MINIPERL) -"I[-.lib]" $(MMS$SOURCE) >$(MMS$TARGET) [.utils]perlivp.com : [.utils]perlivp.PL $(ARCHDIR)Config.pm - $(MINIPERL_UP) $(MMS$SOURCE) + $(MINIPERL) -"I[-.lib]" $(MMS$SOURCE) [.utils]cpan.com : [.utils]cpan.PL $(ARCHDIR)Config.pm - $(MINIPERL_UP) $(MMS$SOURCE) + $(MINIPERL) -"I[-.lib]" $(MMS$SOURCE) [.utils]cpanp.com : [.utils]cpanp.PL $(ARCHDIR)Config.pm - $(MINIPERL_UP) $(MMS$SOURCE) + $(MINIPERL) -"I[-.lib]" $(MMS$SOURCE) [.utils]cpan2dist.com : [.utils]cpan2dist.PL $(ARCHDIR)Config.pm - $(MINIPERL_UP) $(MMS$SOURCE) + $(MINIPERL) -"I[-.lib]" $(MMS$SOURCE) [.utils]cpanp-run-perl.com : [.utils]cpanp-run-perl.PL $(ARCHDIR)Config.pm - $(MINIPERL_UP) $(MMS$SOURCE) + $(MINIPERL) -"I[-.lib]" $(MMS$SOURCE) [.utils]prove.com : [.utils]prove.PL $(ARCHDIR)Config.pm - $(MINIPERL_UP) $(MMS$SOURCE) + $(MINIPERL) -"I[-.lib]" $(MMS$SOURCE) [.utils]ptar.com : [.utils]ptar.PL $(ARCHDIR)Config.pm - $(MINIPERL_UP) $(MMS$SOURCE) + $(MINIPERL) -"I[-.lib]" $(MMS$SOURCE) [.utils]ptardiff.com : [.utils]ptardiff.PL $(ARCHDIR)Config.pm - $(MINIPERL_UP) $(MMS$SOURCE) + $(MINIPERL) -"I[-.lib]" $(MMS$SOURCE) [.utils]shasum.com : [.utils]shasum.PL $(ARCHDIR)Config.pm - $(MINIPERL_UP) $(MMS$SOURCE) + $(MINIPERL) -"I[-.lib]" $(MMS$SOURCE) [.utils]config_data.com : [.utils]config_data.PL $(ARCHDIR)Config.pm - $(MINIPERL_UP) $(MMS$SOURCE) + $(MINIPERL) -"I[-.lib]" $(MMS$SOURCE) [.utils]corelist.com : [.utils]corelist.PL $(ARCHDIR)Config.pm - $(MINIPERL_UP) $(MMS$SOURCE) + $(MINIPERL) -"I[-.lib]" $(MMS$SOURCE) [.utils]c2ph.com : [.utils]c2ph.PL $(ARCHDIR)Config.pm - $(MINIPERL_UP) $(MMS$SOURCE) + $(MINIPERL) -"I[-.lib]" $(MMS$SOURCE) [.utils]dprofpp.com : [.utils]dprofpp.PL $(ARCHDIR)Config.pm - $(MINIPERL_UP) $(MMS$SOURCE) + $(MINIPERL) -"I[-.lib]" $(MMS$SOURCE) [.utils]enc2xs.com : [.utils]enc2xs.PL $(ARCHDIR)Config.pm - $(MINIPERL_UP) $(MMS$SOURCE) + $(MINIPERL) -"I[-.lib]" $(MMS$SOURCE) [.utils]h2ph.com : [.utils]h2ph.PL $(ARCHDIR)Config.pm - $(MINIPERL_UP) $(MMS$SOURCE) + $(MINIPERL) -"I[-.lib]" $(MMS$SOURCE) [.utils]h2xs.com : [.utils]h2xs.PL $(ARCHDIR)Config.pm - $(MINIPERL_UP) $(MMS$SOURCE) + $(MINIPERL) -"I[-.lib]" $(MMS$SOURCE) [.utils]instmodsh.com : [.utils]instmodsh.PL $(ARCHDIR)Config.pm - $(MINIPERL_UP) $(MMS$SOURCE) + $(MINIPERL) -"I[-.lib]" $(MMS$SOURCE) [.utils]libnetcfg.com : [.utils]libnetcfg.PL $(ARCHDIR)Config.pm - $(MINIPERL_UP) $(MMS$SOURCE) + $(MINIPERL) -"I[-.lib]" $(MMS$SOURCE) [.lib]perlbug.com : [.utils]perlbug.PL $(ARCHDIR)Config.pm - $(MINIPERL_UP) $(MMS$SOURCE) + $(MINIPERL) -"I[-.lib]" $(MMS$SOURCE) Copy/NoConfirm/Log [.utils]perlbug.com [.lib] [.utils]piconv.com : [.utils]piconv.PL $(ARCHDIR)Config.pm - $(MINIPERL_UP) $(MMS$SOURCE) + $(MINIPERL) -"I[-.lib]" $(MMS$SOURCE) [.utils]pl2pm.com : [.utils]pl2pm.PL $(ARCHDIR)Config.pm - $(MINIPERL_UP) $(MMS$SOURCE) + $(MINIPERL) -"I[-.lib]" $(MMS$SOURCE) [.lib]splain.com : [.utils]splain.PL $(ARCHDIR)Config.pm - $(MINIPERL_UP) $(MMS$SOURCE) + $(MINIPERL) -"I[-.lib]" $(MMS$SOURCE) Copy/NoConfirm/Log [.utils]splain.com [.lib] [.x2p]find2perl.com : [.x2p]find2perl.PL $(ARCHDIR)Config.pm - $(MINIPERL_UP) $(MMS$SOURCE) + $(MINIPERL) -"I[-.lib]" $(MMS$SOURCE) [.x2p]s2p.com : [.x2p]s2p.PL $(ARCHDIR)Config.pm - $(MINIPERL_UP) $(MMS$SOURCE) + $(MINIPERL) -"I[-.lib]" $(MMS$SOURCE) [.utils]xsubpp.com : [.utils]xsubpp.PL $(ARCHDIR)Config.pm nonxsext - $(MINIPERL_UP) $(MMS$SOURCE) + $(MINIPERL) -"I[-.lib]" $(MMS$SOURCE) # Rename catches problem with some DECC versions in which object file is # placed in current default dir, not same one as source file. @@ -713,37 +712,37 @@ nonxsext : $(LIBPREREQ) preplibrary $(MINIPERL_EXE) [.lib.pods]pod2html.com : [.pod]pod2html.PL $(ARCHDIR)Config.pm @ If F$Search("[.lib]pods.dir").eqs."" Then Create/Directory [.lib.pods] - $(MINIPERL_UP) $(MMS$SOURCE) + $(MINIPERL) -"I[-.lib]" $(MMS$SOURCE) Copy/NoConfirm/Log [.pod]pod2html.com [.lib.pods] [.lib.pods]pod2latex.com : [.pod]pod2latex.PL $(ARCHDIR)Config.pm @ If F$Search("[.lib]pods.dir").eqs."" Then Create/Directory [.lib.pods] - $(MINIPERL_UP) $(MMS$SOURCE) + $(MINIPERL) -"I[-.lib]" $(MMS$SOURCE) Copy/NoConfirm/Log [.pod]pod2latex.com [.lib.pods] [.lib.pods]pod2man.com : [.pod]pod2man.PL $(ARCHDIR)Config.pm @ If F$Search("[.lib]pods.dir").eqs."" Then Create/Directory [.lib.pods] - $(MINIPERL_UP) $(MMS$SOURCE) + $(MINIPERL) -"I[-.lib]" $(MMS$SOURCE) Copy/NoConfirm/Log [.pod]pod2man.com [.lib.pods] [.lib.pods]pod2text.com : [.pod]pod2text.PL $(ARCHDIR)Config.pm @ If F$Search("[.lib]pods.dir").eqs."" Then Create/Directory [.lib.pods] - $(MINIPERL_UP) $(MMS$SOURCE) + $(MINIPERL) -"I[-.lib]" $(MMS$SOURCE) Copy/NoConfirm/Log [.pod]pod2text.com [.lib.pods] [.lib.pods]podchecker.com : [.pod]podchecker.PL $(ARCHDIR)Config.pm @ If F$Search("[.lib]pods.dir").eqs."" Then Create/Directory [.lib.pods] - $(MINIPERL_UP) $(MMS$SOURCE) + $(MINIPERL) -"I[-.lib]" $(MMS$SOURCE) Copy/NoConfirm/Log [.pod]podchecker.com [.lib.pods] [.lib.pods]pod2usage.com : [.pod]pod2usage.PL $(ARCHDIR)Config.pm @ If F$Search("[.lib]pods.dir").eqs."" Then Create/Directory [.lib.pods] - $(MINIPERL_UP) $(MMS$SOURCE) + $(MINIPERL) -"I[-.lib]" $(MMS$SOURCE) Copy/NoConfirm/Log [.pod]pod2usage.com [.lib.pods] [.lib.pods]podselect.com : [.pod]podselect.PL $(ARCHDIR)Config.pm @ If F$Search("[.lib]pods.dir").eqs."" Then Create/Directory [.lib.pods] - $(MINIPERL_UP) $(MMS$SOURCE) + $(MINIPERL) -"I[-.lib]" $(MMS$SOURCE) Copy/NoConfirm/Log [.pod]podselect.com [.lib.pods] preplibrary : $(MINIPERL_EXE) $(LIBPREREQ)