Document PERL_INSTALL_ROOT of #7210.

[p5sagit/p5-mst-13.2.git] / Makefile.SH

diff --git a/Makefile.SH b/Makefile.SH
index 9b160ed..5418fc4 100644 (file)
--- a/Makefile.SH
+++ b/Makefile.SH
@@ -70,7 +70,7 @@ true)
                *)      shrpldflags="$shrpldflags -b noentry"
                        ;;
                esac
-               shrpldflags="$shrpldflags $ldflags $libs $cryptlib"
+               shrpldflags="$shrpldflags $ldflags $perllibs $cryptlib"
                linklibperl="-L $archlibexp/CORE -L `pwd | sed 's/\/UU$//'` -lperl"
                ;;
        hpux*)
@@ -174,7 +174,7 @@ nonxs_ext = $nonxs_list
 ext = \$(dynamic_ext) \$(static_ext) \$(nonxs_ext)
 DYNALOADER = lib/auto/DynaLoader/DynaLoader\$(LIB_EXT)
 
-libs = $libs $cryptlib
+libs = $perllibs $cryptlib
 
 public = perl $suidperl utilities translators
 
@@ -204,11 +204,12 @@ SHELL = $sh
 # how to tr(anslate) newlines
 TRNL = '$trnl'
 
+!GROK!THIS!
 # not used by Makefile but by installperl;
-# mentioned here so that metaconfig picks it up
-INSTALL_USR_BIN_PERL = $installusrbinperl
+# mentioned here so that metaconfig picks these up
+# $installusrbinperl
+# $versiononly
 
-!GROK!THIS!
 
 ## In the following dollars and backticks do not need the extra backslash.
 $spitshell >>Makefile <<'!NO!SUBS!'
@@ -342,7 +343,7 @@ esac
 case "$osname" in
 aix)
        $spitshell >>Makefile <<!GROK!THIS!
-LIBS                   = $libs
+LIBS                   = $perllibs
 # In AIX we need to change this for building Perl itself from
 # its earlier definition (which is for building external
 # extensions *after* Perl has been built and installed)
@@ -737,7 +738,7 @@ _cleaner2:
        rm -f h2ph.man pstruct
        rm -rf .config
        rm -f testcompile compilelog
-       -rmdir lib/B lib/Data lib/IO/Socket lib/IO lib/Sys lib/Thread
+       -rmdir lib/B lib/Data lib/Encode lib/IO/Socket lib/IO lib/Sys lib/Thread
 
 _realcleaner: 
        @$(LDLIBPTH) $(MAKE) _cleaner1 CLEAN=realclean