Spelling - megapatch

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

diff --git a/U/installdirs/html1dir.U b/U/installdirs/html1dir.U
index 463fd7d..aa1fc56 100644 (file)
--- a/U/installdirs/html1dir.U
+++ b/U/installdirs/html1dir.U
@@ -1,20 +1,20 @@
 ?RCS: $Id: html1dir.U,v $
 ?RCS:
 ?RCS: Copyright (c) 1999 Andy Dougherty
-?RCS: 
-?RCS: You may redistribute only under the terms of the Artistic Licence,
+?RCS:
+?RCS: You may redistribute only under the terms of the Artistic License,
 ?RCS: as specified in the README file that comes with the distribution.
 ?RCS: You may reuse parts of this distribution only within the terms of
-?RCS: that same Artistic Licence; a copy of which may be found at the root
+?RCS: that same Artistic License; a copy of which may be found at the root
 ?RCS: of the source tree for dist 3.0.
 ?RCS:
 ?RCS: $Log: html1dir.U,v $
 ?RCS:
-?MAKE:html1dir html1direxp installhtml1dir: cat Loc \
-       spackage test Getfile Prefixit Prefixup Myread \
-       prefix installprefix
+?MAKE:html1dir html1direxp installhtml1dir: cat Loc Myread \
+       spackage test Getfile Setprefixvar Prefixit Prefixup
 ?MAKE: -pick add $@ %<
 ?Y:TOP
+?D:html1dir=''
 ?S:html1dir:
 ?S:    This variable contains the name of the directory in which html
 ?S:    source pages are to be put.  This directory is for pages
@@ -22,21 +22,26 @@
 ?S:    is intended to correspond roughly to section 1 of the Unix
 ?S:    manuals.
 ?S:.
+?D:html1direxp=''
 ?S:html1direxp:
 ?S:    This variable is the same as the html1dir variable, but is filename
 ?S:    expanded at configuration time, for convenient use in makefiles.
 ?S:.
+?D:installhtml1dir=''
 ?S:installhtml1dir:
-?S:    This variable is really the same as html1direxp, unless you are 
-?S:    using a different installprefix.  For extra portability, you 
+?S:    This variable is really the same as html1direxp, unless you are
+?S:    using a different installprefix.  For extra portability, you
 ?S:    should only use this variable within your makefiles.
 ?S:.
+?LINT:change prefixvar
+?LINT:set html1direxp
+?LINT:set installhtml1dir
 : determine where html pages for programs go
 set html1dir html1dir none
 eval $prefixit
 $cat <<EOM
 
-If you wish to install html files for programs in $spackage, indicate 
+If you wish to install html files for programs in $spackage, indicate
 the appropriate directory here.  To skip installing html files,
 answer "none".
 EOM
@@ -47,18 +52,8 @@ esac
 fn=dn+~
 rp="Directory for the main $spackage html pages?"
 . ./getfile
-html1dir="$ans"
-html1direxp="$ansexp"
-case "$html1dir" in
-''|none)
-       : Use ' ' so value is preserved next time through Configure
-       html1dir=' '  
-       installhtml1dir='';;
-*)
-       : Change installation prefix, if necessary.
-       if $test X"$prefix" != X"$installprefix"; then
-               installhtml1dir=`echo $html1direxp | sed 's#^$prefix#$installprefix#'`
-       fi
-       ;;
-esac
+prefixvar=html1dir
+. ./setprefixvar
+: Use ' ' for none so value is preserved next time through Configure
+$test X"$html1dir" = "X" && html1dir=' '