From: SMTP%"ram@acri.fr" 17-FEB-1995 16:46:30.13 To: USRC CC: Subj: v47i060: dist-3.0 - Configure script generator and related tools, Patch51 Resent-Date: 16 Feb 1995 14:07:44 -0600 Path: decwrl!amd!amdahl.com!pacbell.com!att-out!rutgers!news.iag.net!news.mathworks.com!uunet!sparky!not-for-mail From: ram@acri.fr (Raphael Manfredi) Newsgroups: comp.sources.misc Subject: v47i060: dist-3.0 - Configure script generator and related tools, Patch51 Followup-To: comp.sources.d Date: 16 Feb 1995 14:07:44 -0600 Organization: Advanced Computer Research Institute, Lyon, France Lines: 1583 Sender: kent@sparky.sterling.com Approved: kent@sparky.sterling.com Message-Id: <3i0bag$hcs@sparky.sterling.com> Nntp-Posting-Host: sparky.sterling.com X-Md4-Signature: 2c1495b31cced2ebf3d30389a379af4f To: unix-sources@pa.dec.com Resent-Message-Id: <"qkNsr3.0.e36.1AHHl"@ftp-gw-1.pa.dec.com> Resent-From: unix-sources@pa.dec.com X-Mailing-List: archive/latest/485 X-Loop: unix-sources@pa.dec.com Precedence: list Resent-Sender: unix-sources-request@pa.dec.com Submitted-by: ram@acri.fr (Raphael Manfredi) Posting-number: Volume 47, Issue 60 Archive-name: dist-3.0/patch51 Environment: UNIX, Perl, RCS Patch-To: dist-3.0: Volume 39, Issue 5-32 [The latest patch for dist version 3.0 is #51.] System: dist version 3.0 Patch #: 51 Priority: LOW Subject: regenerated Configure with pre-release of 3.0 PL51 Subject: now clearer about how to edit config.sh at the prompt (WED) Subject: was not working if ~'s allowed with d_portable on (WED) Subject: author name now appears at the end of the paragraph (WED) Subject: adapted osvers computation for AIX (ADO) Subject: architecture name is now computed by a separate unit Subject: was mistakenly duplicating /usr/local/man/man1 (ADO) Subject: added /opt/man/man1 to the lookpath (ADO) Subject: now correctly handles NeXT using NIS rather than NetInfo Subject: one new file Date: Wed Feb 15 15:23:50 MET 1995 From: Raphael Manfredi Description: This patch only contains random cleanup and minor fixes that were brought to my attention on the dist-users list. Regenerated Configure with pre-release of 3.0 PL51, since it was a little outdated. Wayne Davison's changes: . now clearer about how to edit config.sh at the end of Configure. . Getfile was not working if ~'s allowed with d_portable on . Instruct.U: author name now appears at the end of a paragraph Andy Dougherty adapted osvers computation for AIX. He also fixed mansrc.U where I had mistakenly duplicated /usr/local/man/man1. He added /opt/man/man1 to the lookpath instead, a change originating from Tye McQueen . Architecture name is now computed by a separate unit. This allows authors to precompute it in a hint file, while warning the user when the machine's architecture name changes (because for instance the OS was upgraded), preventing mistakes. Now correctly handles NeXT using NIS rather than NetInfo, thanks to a patch sent by Graham Stoney . One new file (unit archname.U). Fix: From rn, say "| patch -p -N -d DIR", where DIR is your dist source directory. Outside of rn, say "cd DIR; patch -p -N If you send a mail message of the following form it will greatly speed processing: Subject: Command @SH mailpatch PATH dist 3.0 LIST ^ note the c where PATH is a return path FROM ME TO YOU either in Internet notation, or in bang notation from some well-known host, and LIST is the number of one or more patches you need, separated by spaces, commas, and/or hyphens. Saying 35- says everything from 35 to the end. To get some more detailed instructions, send me the following mail: Subject: Command @SH mailhelp PATH Index: patchlevel.h Prereq: 50 4c4 < #define PATCHLEVEL 50 --- > #define PATCHLEVEL 51 Index: Configure Prereq: 3.0.1.7 *** Configure.old Wed Feb 15 15:16:32 1995 --- Configure Wed Feb 15 15:16:33 1995 *************** *** 18,26 **** # archive site. Check with Archie if you don't know where that can be.) # ! # $Id: Configure,v 3.0.1.7 1995/01/11 14:45:31 ram Exp $ # ! # Generated on Wed Jan 11 15:10:30 MET 1995 [metaconfig 3.0 PL44] cat >/tmp/c1$$ </tmp/c1$$ <&2 ;; *=*) echo "$1" | \ ! sed -e "s/'/'\"'\"'/g" -e "s/=\(.*\)/='\1'/" >> $optdef;; ! *) echo "$1='define'" >> $optdef;; esac shift ;; -U) shift case "$1" in ! *=) echo "$1" >> $optdef;; *=*) echo "$me: use '-D symbol=val', not '-U symbol=val'." >&2 echo "$me: ignoring -U $1" >&2 ;; ! *) echo "$1='undef'" >> $optdef;; esac shift ;; ! -V) echo "$me generated by metaconfig 3.0 PL44." >&2 exit 0;; --) break;; -*) echo "$me: unknown option $1" >&2; shift; error=true;; --- 396,419 ---- echo "$me: ignoring -D $1" >&2 ;; *=*) echo "$1" | \ ! sed -e "s/'/'\"'\"'/g" -e "s/=\(.*\)/='\1'/" >> optdef.sh;; ! *) echo "$1='define'" >> optdef.sh;; esac shift ;; -U) shift case "$1" in ! *=) echo "$1" >> optdef.sh;; *=*) echo "$me: use '-D symbol=val', not '-U symbol=val'." >&2 echo "$me: ignoring -U $1" >&2 ;; ! *) echo "$1='undef'" >> optdef.sh;; esac shift ;; ! -V) echo "$me generated by metaconfig 3.0 PL50." >&2 exit 0;; --) break;; -*) echo "$me: unknown option $1" >&2; shift; error=true;; *************** *** 453,460 **** esac : run the defines and the undefines, if any, but leave the file out there... ! touch $optdef ! . ./$optdef case "$extractsh" in true) --- 453,460 ---- esac : run the defines and the undefines, if any, but leave the file out there... ! touch optdef.sh ! . ./optdef.sh case "$extractsh" in true) *************** *** 467,473 **** echo "Fetching answers from $config_sh..." cd .. . $config ! test "$override" && . ./$optdef echo " " . ./UU/extract rm -rf UU --- 467,473 ---- echo "Fetching answers from $config_sh..." cd .. . $config ! test "$override" && . ./optdef.sh echo " " . ./UU/extract rm -rf UU *************** *** 478,490 **** : set package name package=dist : Eunice requires " " instead of "", can you believe it echo " " : Here we go... echo "Beginning of configuration questions for $package." ! trap 'echo " "; rm -rf $rmlist; exit 1' 1 2 3 15 : Some greps do not return status, grrr. echo "grimblepritz" >grimble --- 478,496 ---- : set package name package=dist + first=`echo $package | sed -e 's/^\(.\).*/\1/'` + last=`echo $package | sed -e 's/^.\(.*\)/\1/'` + case "`echo AbyZ | tr '[:lower:]' '[:upper:]' 2>/dev/null`" in + ABYZ) spackage=`echo $first | tr '[:lower:]' '[:upper:]'`$last;; + *) spackage=`echo $first | tr '[a-z]' '[A-Z]'`$last;; + esac : Eunice requires " " instead of "", can you believe it echo " " : Here we go... echo "Beginning of configuration questions for $package." ! trap 'echo " "; test -d ../UU && rm -rf X $rmlist; exit 1' 1 2 3 15 : Some greps do not return status, grrr. echo "grimblepritz" >grimble *************** *** 739,747 **** Much effort has been expended to ensure that this shell script will run on any Unix system. If despite that it blows up on yours, your best bet is to edit ! Configure and run it again. Also, let me (ram@acri.fr) ! know how I blew it. If you can't run Configure for some reason, you'll have to ! generate a config.sh file by hand. This installation script affects things in two ways: --- 745,753 ---- Much effort has been expended to ensure that this shell script will run on any Unix system. If despite that it blows up on yours, your best bet is to edit ! Configure and run it again. If you can't run Configure for some reason, ! you'll have to generate a config.sh file by hand. Whatever problems you ! have, let me (ram@acri.fr) know how I blew it. This installation script affects things in two ways: *************** *** 1034,1048 **** myuname=`( ($uname -a) 2>/dev/null || hostname) 2>&1` myuname=`echo $myuname | $sed -e 's/^[^=]*=//' -e 's/\///g' | \ ./tr '[A-Z]' '[a-z]' | tr '\012' ' '` dflt=n if test "$fastread" = yes; then dflt=y elif test -f ../config.sh; then - oldmyuname='' if $contains myuname= ../config.sh >/dev/null 2>&1; then ! eval "old`grep myuname= ../config.sh`" fi ! if test "X$myuname" = "X$oldmyuname"; then dflt=y fi fi --- 1040,1054 ---- myuname=`( ($uname -a) 2>/dev/null || hostname) 2>&1` myuname=`echo $myuname | $sed -e 's/^[^=]*=//' -e 's/\///g' | \ ./tr '[A-Z]' '[a-z]' | tr '\012' ' '` + newmyuname="$myuname" dflt=n if test "$fastread" = yes; then dflt=y elif test -f ../config.sh; then if $contains myuname= ../config.sh >/dev/null 2>&1; then ! eval "`grep myuname= ../config.sh`" fi ! if test "X$myuname" = "X$newmyuname"; then dflt=y fi fi *************** *** 1060,1066 **** tmp_n="$n" tmp_c="$c" . ../config.sh - test "$override" && . ./$optdef cp ../config.sh . n="$tmp_n" c="$tmp_c" --- 1066,1071 ---- *************** *** 1078,1090 **** cp $config_sh config.sh 2>/dev/null . ./config.sh cd UU - test "$override" && . ./$optdef cp ../config.sh . n="$tmp_n" c="$tmp_c" hint=previous ;; esac : Restore computed paths for file in $loclist $trylist; do --- 1083,1096 ---- cp $config_sh config.sh 2>/dev/null . ./config.sh cd UU cp ../config.sh . n="$tmp_n" c="$tmp_c" hint=previous ;; esac + test "$override" && . ./optdef.sh + myuname="$newmyuname" : Restore computed paths for file in $loclist $trylist; do *************** *** 1206,1212 **** y*) passcat='nidump passwd .' ;; *) echo "You told me, so don't blame me." - passcat='cat /etc/passwd' ;; esac echo " " --- 1212,1217 ---- *************** *** 1220,1226 **** . ./myread case "$ans" in y*) hostcat='nidump hosts .';; ! *) hostcat='cat /etc/hosts';; esac fi case "$passcat" in --- 1225,1231 ---- . ./myread case "$ans" in y*) hostcat='nidump hosts .';; ! *) ;; esac fi case "$passcat" in *************** *** 1685,1695 **** fi ;; Locate) ! if test -d "$value"; then echo "(Looking for $loc_file in directory $value.)" value="$value/$loc_file" fi ! if test -f "$value"; then type='' fi case "$nopath_ok" in --- 1690,1701 ---- fi ;; Locate) ! if test -d "$ansexp"; then echo "(Looking for $loc_file in directory $value.)" value="$value/$loc_file" + ansexp="$ansexp/$loc_file" fi ! if test -f "$ansexp"; then type='' fi case "$nopath_ok" in *************** *** 1925,1942 **** binaries. If you wish to have binaries under /bin but manual pages under /usr/local/man, that's ok: you will be prompted separately for each of the installation directories, the prefix being only used ! to set defaults. EOM fn=d~ rp='Installation prefix to use?' . ./getfile prefix="$ans" : determine where manual pages go $cat < ?RCS: ?RCS: $Log: archlib.U,v $ + ?RCS: Revision 3.0.1.3 1995/02/15 14:14:14 ram + ?RCS: patch51: architecture name is now computed by a separate unit + ?RCS: ?RCS: Revision 3.0.1.2 1995/01/30 14:32:22 ram ?RCS: patch49: archname is now systematically recomputed ?RCS: patch49: can now handle installation prefix changes (from WED) *************** *** 18,36 **** ?RCS: Revision 3.0.1.1 1994/10/29 16:02:36 ram ?RCS: patch36: created by ADO ?RCS: ! ?MAKE:d_archlib archlib archlibexp installarchlib archname: afs spackage \ ! cat Getfile Loc Oldconfig prefixexp privlib osname test Prefixit rm \ ! Prefixup ?MAKE: -pick add $@ %< ?S:d_archlib: ?S: This variable conditionally defines ARCHLIB to hold the pathname ?S: of architecture-dependent library files for $package. If ?S: $archlib is the same as $privlib, then this is set to undef. ?S:. - ?S:archname: - ?S: This variable is a short name to characterize the current - ?S: architecture. It is used to construct the default archlib. - ?S:. ?S:archlib: ?S: This variable holds the name of the directory in which the user wants ?S: to put architecture-dependent public library files for $package. --- 21,34 ---- ?RCS: Revision 3.0.1.1 1994/10/29 16:02:36 ram ?RCS: patch36: created by ADO ?RCS: ! ?MAKE:d_archlib archlib archlibexp installarchlib: archname afs spackage \ ! cat Getfile Loc Oldconfig prefixexp privlib test Prefixit Prefixup ?MAKE: -pick add $@ %< ?S:d_archlib: ?S: This variable conditionally defines ARCHLIB to hold the pathname ?S: of architecture-dependent library files for $package. If ?S: $archlib is the same as $privlib, then this is set to undef. ?S:. ?S:archlib: ?S: This variable holds the name of the directory in which the user wants ?S: to put architecture-dependent public library files for $package. *************** *** 63,83 **** ?H:#$d_archlib ARCHLIB "$archlib" /**/ ?H:#$d_archlib ARCHLIB_EXP "$archlibexp" /**/ ?H:. - ?T:xxx tarchname : determine where public architecture dependent libraries go - ?X: Always recompute archname in case osname changes -- RAM - if xxx=`./loc arch blurfl $pth`; test -f "$xxx"; then - tarchname=`arch` - archname="${tarchname}-$osname" - elif xxx=`./loc uname blurfl $pth`; test -f "$xxx" ; then - if uname -m > tmparch 2>&1 ; then - tarchname=`cat tmparch` - archname="${tarchname}-$osname" - fi - $rm -f tmparch - else - archname="$osname" - fi set archlib archlib eval $prefixit case "$archlib" in --- 61,67 ---- Index: mcon/U/archname.U *** mcon/U/archname.U.old Wed Feb 15 15:16:37 1995 --- mcon/U/archname.U Wed Feb 15 15:16:37 1995 *************** *** 0 **** --- 1,69 ---- + ?RCS: $Id: archname.U,v 3.0.1.1 1995/02/15 14:14:21 ram Exp $ + ?RCS: + ?RCS: Copyright (c) 1991-1993, Raphael Manfredi + ?RCS: + ?RCS: You may redistribute only under the terms of the Artistic Licence, + ?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: of the source tree for dist 3.0. + ?RCS: + ?RCS: $Log: archname.U,v $ + ?RCS: Revision 3.0.1.1 1995/02/15 14:14:21 ram + ?RCS: patch51: created + ?RCS: + ?MAKE:archname myarchname: cat Loc Myread Oldconfig osname test rm + ?MAKE: -pick add $@ %< + ?S:archname: + ?S: This variable is a short name to characterize the current + ?S: architecture. It is used mainly to construct the default archlib. + ?S:. + ?S:myarchname: + ?S: This variable holds the architecture name computed by Configure in + ?S: a previous run. It is not intended to be perused by any user and + ?S: should never be set in a hint file. + ?S:. + ?C:ARCHNAME: + ?C: This symbol holds a string representing the architecture name. + ?C: It may be used to construct an architecture-dependant pathname + ?C: where library files may be held under a private library, for + ?C: instance. + ?C:. + ?H:#define ARCHNAME "$archname" /**/ + ?H:. + ?T:xxx tarch + : determine the architecture name + echo " " + ?X: We always recompute archname in case osname changes. However, we need + ?X: to be careful since, as ADO rightfully pointed out, some systems pick + ?X: silly architecture names (0001307135000-aix on AIX or 9000/715-ux under + ?X: HP-UX). Therefore, we allow hint files to superseed our guess and ask + ?X: the user for confirmation. + if xxx=`./loc arch blurfl $pth`; $test -f "$xxx"; then + tarch=`arch`"-$osname" + elif xxx=`./loc uname blurfl $pth`; $test -f "$xxx" ; then + if uname -m > tmparch 2>&1 ; then + tarch=`$cat tmparch`"-$osname" + else + tarch="$osname" + fi + $rm -f tmparch + else + tarch="$osname" + fi + case "$myarchname" in + ''|"$tarch") ;; + *) + echo "(Your architecture name used to be $myarchname.)" + archname='' + ;; + esac + case "$archname" in + '') dflt="$tarch";; + *) dflt="$archname";; + esac + rp='What is your architecture name' + . ./myread + archname="$ans" + myarchname="$tarch" + Index: ChangeLog *** ChangeLog.old Wed Feb 15 15:23:49 1995 --- ChangeLog Wed Feb 15 15:23:49 1995 *************** *** 1,3 **** --- 1,57 ---- + Wed Feb 15 15:23:06 MET 1995 Raphael Manfredi + + . Description: + + This patch only contains random cleanup and minor fixes that were + brought to my attention on the dist-users list. + + Regenerated Configure with pre-release of 3.0 PL51, since it + was a little outdated. + + Wayne Davison's changes: + . now clearer about how to edit config.sh at the end of Configure. + . Getfile was not working if ~'s allowed with d_portable on + . Instruct.U: author name now appears at the end of a paragraph + + Andy Dougherty adapted osvers computation for AIX. He also + fixed mansrc.U where I had mistakenly duplicated /usr/local/man/man1. + He added /opt/man/man1 to the lookpath instead, a change originating + from Tye McQueen . + + Architecture name is now computed by a separate unit. This allows + authors to precompute it in a hint file, while warning the user + when the machine's architecture name changes (because for instance + the OS was upgraded), preventing mistakes. + + Now correctly handles NeXT using NIS rather than NetInfo, thanks + to a patch sent by Graham Stoney . + + One new file (unit archname.U). + + . Files changed: + + * mcon/U/Finish.U: Now clearer about how to edit config.sh at the + prompt (WED). + + * mcon/U/Getfile.U: Was not working if ~'s allowed with d_portable on + (WED). + + * mcon/U/Instruct.U: Author name now appears at the end of the + paragraph (WED). + + * mcon/U/Oldconfig.U: Adapted osvers computation for AIX (ADO). + + * mcon/U/archlib.U: Architecture name is now computed by a separate + unit. + + * mcon/U/archname.U: Created. + + * mcon/U/mansrc.U: Was mistakenly duplicating /usr/local/man/man1 + (ADO). Added /opt/man/man1 to the lookpath (ADO). + + * mcon/U/nis.U: Now correctly handles NeXT using NIS rather than + NetInfo. + Mon Jan 30 15:59:00 MET 1995 Raphael Manfredi . Description: Index: mcon/U/Oldconfig.U Prereq: 3.0.1.6 *** mcon/U/Oldconfig.U.old Wed Feb 15 15:16:36 1995 --- mcon/U/Oldconfig.U Wed Feb 15 15:16:36 1995 *************** *** 1,4 **** ! ?RCS: $Id: Oldconfig.U,v 3.0.1.6 1995/01/30 14:27:15 ram Exp $ ?RCS: ?RCS: Copyright (c) 1991-1993, Raphael Manfredi ?RCS: --- 1,4 ---- ! ?RCS: $Id: Oldconfig.U,v 3.0.1.7 1995/02/15 14:13:41 ram Exp $ ?RCS: ?RCS: Copyright (c) 1991-1993, Raphael Manfredi ?RCS: *************** *** 9,14 **** --- 9,17 ---- ?RCS: of the source tree for dist 3.0. ?RCS: ?RCS: $Log: Oldconfig.U,v $ + ?RCS: Revision 3.0.1.7 1995/02/15 14:13:41 ram + ?RCS: patch51: adapted osvers computation for AIX (ADO) + ?RCS: ?RCS: Revision 3.0.1.6 1995/01/30 14:27:15 ram ?RCS: patch49: unit Options.U now exports file optdef.sh, not a variable ?RCS: patch49: update code for myuname changed (WED) *************** *** 180,192 **** case "$1" in aix) osname=aix tmp=`( (oslevel) 2>/dev/null || echo "not found") 2>&1` case "$tmp" in ! 'not found') osvers=3.2.0 ;; '<3240'|'<>3240') osvers=3.2.0 ;; '=3240'|'>3240'|'<3250'|'<>3250') osvers=3.2.4 ;; '=3250'|'>3250') osvers=3.2.5 ;; ! *) osvers='' ;; esac ;; dnix) osname=dnix --- 183,201 ---- case "$1" in aix) osname=aix + ?X: aix 4.1 uname -a output looks like + ?X: AIX foo 1 4 000123456789 + ?X: where $4 is the major release number and $3 is the (minor) version. + ?X: More detail on the version is available with the oslevel command. + ?X: in 3.2.x, it output a string (see case statements below). In 4.1, + ?X: it puts out something like 4.1.1.0 tmp=`( (oslevel) 2>/dev/null || echo "not found") 2>&1` case "$tmp" in ! 'not found') osvers="$4"."$3" ;; '<3240'|'<>3240') osvers=3.2.0 ;; '=3240'|'>3240'|'<3250'|'<>3250') osvers=3.2.4 ;; '=3250'|'>3250') osvers=3.2.5 ;; ! *) osvers=$tmp;; esac ;; dnix) osname=dnix Index: mcon/U/Instruct.U Prereq: 3.0.1.1 *** mcon/U/Instruct.U.old Wed Feb 15 15:16:35 1995 --- mcon/U/Instruct.U Wed Feb 15 15:16:35 1995 *************** *** 1,4 **** ! ?RCS: $Id: Instruct.U,v 3.0.1.1 1995/01/11 15:12:05 ram Exp $ ?RCS: ?RCS: Copyright (c) 1991-1993, Raphael Manfredi ?RCS: --- 1,4 ---- ! ?RCS: $Id: Instruct.U,v 3.0.1.2 1995/02/15 14:11:34 ram Exp $ ?RCS: ?RCS: Copyright (c) 1991-1993, Raphael Manfredi ?RCS: *************** *** 9,14 **** --- 9,17 ---- ?RCS: of the source tree for dist 3.0. ?RCS: ?RCS: $Log: Instruct.U,v $ + ?RCS: Revision 3.0.1.2 1995/02/15 14:11:34 ram + ?RCS: patch51: author name now appears at the end of the paragraph (WED) + ?RCS: ?RCS: Revision 3.0.1.1 1995/01/11 15:12:05 ram ?RCS: patch45: now documents the & escape to turn -d on at the read prompt ?RCS: *************** *** 82,90 **** Much effort has been expended to ensure that this shell script will run on any Unix system. If despite that it blows up on yours, your best bet is to edit ! Configure and run it again. Also, let me () ! know how I blew it. If you can't run Configure for some reason, you'll have to ! generate a config.sh file by hand. This installation script affects things in two ways: --- 85,93 ---- Much effort has been expended to ensure that this shell script will run on any Unix system. If despite that it blows up on yours, your best bet is to edit ! Configure and run it again. If you can't run Configure for some reason, ! you'll have to generate a config.sh file by hand. Whatever problems you ! have, let me () know how I blew it. This installation script affects things in two ways: Index: mcon/U/mansrc.U Prereq: 3.0.1.6 *** mcon/U/mansrc.U.old Wed Feb 15 15:16:37 1995 --- mcon/U/mansrc.U Wed Feb 15 15:16:37 1995 *************** *** 1,4 **** ! ?RCS: $Id: mansrc.U,v 3.0.1.6 1995/01/30 14:39:34 ram Exp $ ?RCS: ?RCS: Copyright (c) 1991-1993, Raphael Manfredi ?RCS: --- 1,4 ---- ! ?RCS: $Id: mansrc.U,v 3.0.1.7 1995/02/15 14:15:31 ram Exp $ ?RCS: ?RCS: Copyright (c) 1991-1993, Raphael Manfredi ?RCS: *************** *** 9,14 **** --- 9,18 ---- ?RCS: of the source tree for dist 3.0. ?RCS: ?RCS: $Log: mansrc.U,v $ + ?RCS: Revision 3.0.1.7 1995/02/15 14:15:31 ram + ?RCS: patch51: was mistakenly duplicating /usr/local/man/man1 (ADO) + ?RCS: patch51: added /opt/man/man1 to the lookpath (ADO) + ?RCS: ?RCS: Revision 3.0.1.6 1995/01/30 14:39:34 ram ?RCS: patch49: can now handle installation prefix changes (from WED) ?RCS: *************** *** 74,80 **** '') lookpath="$prefixexp/man/man1 $prefixexp/man/u_man/man1" lookpath="$lookpath $prefixexp/man/l_man/man1" ! lookpath="$lookpath /usr/local/man/man1 /usr/local/man/man1 /usr/man/manl" lookpath="$lookpath /usr/man/local/man1 /usr/man/l_man/man1" lookpath="$lookpath /usr/local/man/u_man/man1 /usr/local/man/l_man/man1" lookpath="$lookpath /usr/man/man.L" --- 78,84 ---- '') lookpath="$prefixexp/man/man1 $prefixexp/man/u_man/man1" lookpath="$lookpath $prefixexp/man/l_man/man1" ! lookpath="$lookpath /usr/local/man/man1 /opt/man/man1 /usr/man/manl" lookpath="$lookpath /usr/man/local/man1 /usr/man/l_man/man1" lookpath="$lookpath /usr/local/man/u_man/man1 /usr/local/man/l_man/man1" lookpath="$lookpath /usr/man/man.L" Index: mcon/U/Getfile.U Prereq: 3.0.1.5 *** mcon/U/Getfile.U.old Wed Feb 15 15:16:34 1995 --- mcon/U/Getfile.U Wed Feb 15 15:16:34 1995 *************** *** 1,4 **** ! ?RCS: $Id: Getfile.U,v 3.0.1.5 1995/01/11 15:11:25 ram Exp $ ?RCS: ?RCS: Copyright (c) 1991-1993, Raphael Manfredi ?RCS: --- 1,4 ---- ! ?RCS: $Id: Getfile.U,v 3.0.1.6 1995/02/15 14:11:00 ram Exp $ ?RCS: ?RCS: Copyright (c) 1991-1993, Raphael Manfredi ?RCS: *************** *** 9,14 **** --- 9,17 ---- ?RCS: of the source tree for dist 3.0. ?RCS: ?RCS: $Log: Getfile.U,v $ + ?RCS: Revision 3.0.1.6 1995/02/15 14:11:00 ram + ?RCS: patch51: was not working if ~'s allowed with d_portable on (WED) + ?RCS: ?RCS: Revision 3.0.1.5 1995/01/11 15:11:25 ram ?RCS: patch45: added support for escaping answers to skip various checks ?RCS: patch45: modified message issued after file expansion *************** *** 241,251 **** fi ;; Locate) ! if test -d "$value"; then echo "(Looking for $loc_file in directory $value.)" value="$value/$loc_file" fi ! if test -f "$value"; then type='' fi case "$nopath_ok" in --- 244,255 ---- fi ;; Locate) ! if test -d "$ansexp"; then echo "(Looking for $loc_file in directory $value.)" value="$value/$loc_file" + ansexp="$ansexp/$loc_file" fi ! if test -f "$ansexp"; then type='' fi case "$nopath_ok" in Index: mcon/U/nis.U Prereq: 3.0 *** mcon/U/nis.U.old Wed Feb 15 15:16:38 1995 --- mcon/U/nis.U Wed Feb 15 15:16:38 1995 *************** *** 1,4 **** ! ?RCS: $Id: nis.U,v 3.0 1993/08/18 12:09:24 ram Exp $ ?RCS: ?RCS: Copyright (c) 1991-1993, Raphael Manfredi ?RCS: --- 1,4 ---- ! ?RCS: $Id: nis.U,v 3.0.1.1 1995/02/15 14:16:23 ram Exp $ ?RCS: ?RCS: Copyright (c) 1991-1993, Raphael Manfredi ?RCS: *************** *** 9,14 **** --- 9,17 ---- ?RCS: of the source tree for dist 3.0. ?RCS: ?RCS: $Log: nis.U,v $ + ?RCS: Revision 3.0.1.1 1995/02/15 14:16:23 ram + ?RCS: patch51: now correctly handles NeXT using NIS rather than NetInfo + ?RCS: ?RCS: Revision 3.0 1993/08/18 12:09:24 ram ?RCS: Baseline for dist 3.0 netwide release. ?RCS: *************** *** 55,64 **** @end ;; *) echo "You told me, so don't blame me." - passcat='cat /etc/passwd' @if groupcat ! echo "(Assuming /etc/group is also local.)" ! groupcat='cat /etc/group' @end ;; esac --- 58,65 ---- @end ;; *) echo "You told me, so don't blame me." @if groupcat ! echo "(Assuming /etc/group is handled the same way.)" @end ;; esac *************** *** 75,81 **** . ./myread case "$ans" in y*) hostcat='nidump hosts .';; ! *) hostcat='cat /etc/hosts';; esac @end fi --- 76,82 ---- . ./myread case "$ans" in y*) hostcat='nidump hosts .';; ! *) ;; esac @end fi Index: mcon/U/Finish.U Prereq: 3.0.1.5 *** mcon/U/Finish.U.old Wed Feb 15 15:16:34 1995 --- mcon/U/Finish.U Wed Feb 15 15:16:34 1995 *************** *** 1,4 **** ! ?RCS: $Id: Finish.U,v 3.0.1.5 1994/10/29 15:53:14 ram Exp $ ?RCS: ?RCS: Copyright (c) 1991-1993, Raphael Manfredi ?RCS: --- 1,4 ---- ! ?RCS: $Id: Finish.U,v 3.0.1.6 1995/02/15 14:09:30 ram Exp $ ?RCS: ?RCS: Copyright (c) 1991-1993, Raphael Manfredi ?RCS: *************** *** 9,14 **** --- 9,17 ---- ?RCS: of the source tree for dist 3.0. ?RCS: ?RCS: $Log: Finish.U,v $ + ?RCS: Revision 3.0.1.6 1995/02/15 14:09:30 ram + ?RCS: patch51: now clearer about how to edit config.sh at the prompt (WED) + ?RCS: ?RCS: Revision 3.0.1.5 1994/10/29 15:53:14 ram ?RCS: patch36: added ?F: line for metalint file checking ?RCS: *************** *** 45,55 **** cont) ;; '') - echo " " dflt='' nostick=true ! echo "If you didn't make any mistakes, then just type a carriage return here." ! rp="If you need to edit config.sh, do it as a shell escape here:" . UU/myread nostick='' case "$ans" in --- 48,62 ---- cont) ;; '') dflt='' nostick=true ! $cat <