Megalopatch for Configure: Andy's new installation schemes;

[metaconfig.git] / U / installdirs / sitearch.U

diff --git a/U/installdirs/sitearch.U b/U/installdirs/sitearch.U
index 42d9bae..ba437ae 100644 (file)
--- a/U/installdirs/sitearch.U
+++ b/U/installdirs/sitearch.U
@@ -17,7 +17,7 @@
 ?RCS: patch61: created
 ?RCS:
 ?MAKE:sitearch sitearchexp installsitearch: cat sed Getfile \
-       Oldconfig Prefixit archname apiversion installprefix \
+       Oldconfig Prefixit archname installprefix \
        prefix sitelib test
 ?MAKE: -pick add $@ %<
 ?Y:TOP
@@ -59,26 +59,26 @@
 ?H:#define SITEARCH "$sitearch"                /**/
 ?H:#define SITEARCH_EXP "$sitearchexp"         /**/
 ?H:.
-?T:tdflt
 : determine where site specific architecture-dependent libraries go.
-: sitelib  default is /usr/local/lib/perl5/site_perl/
-: sitearch default is /usr/local/lib/perl5/site_perl/$apiversion/$archname
+: sitelib  default is /usr/local/lib/perl5/site_perl/$version
+: sitearch default is /usr/local/lib/perl5/site_perl/$version/$archname
 : sitelib may have an optional trailing /share.
-tdflt=`echo $sitelib | $sed 's,/share$,,'`
-tdflt="$tdflt/$apiversion/$archname"
-set sitearch sitearch none
-eval $prefixit
 case "$sitearch" in
-'')    dflt="$tdflt" ;;
-*)     dflt="$sitearch" ;;
+'')    dflt=`echo $sitelib | $sed 's,/share$,,'`
+       dflt="$dflt/$archname"
+       ;;
+*)     dflt="$sitearch"
+       ;;
 esac
+set sitearch sitearch none
+eval $prefixit
 $cat <<EOM
 
 The installation process will also create a directory for
 architecture-dependent site-specific extensions and modules.
 
 EOM
-fn=nd~+
+fn=d~+
 rp='Pathname for the site-specific architecture-dependent library files?'
 . ./getfile
 sitearch="$ans"