--- ray/makeall	2003/08/30 08:22:47	1.9
+++ ray/makeall	2003/12/11 23:42:54	1.11
@@ -1,5 +1,5 @@
 #!/bin/csh -f
-# RCSid $Id: makeall,v 1.9 2003/08/30 08:22:47 schorsch Exp $
+# RCSid $Id: makeall,v 1.11 2003/12/11 23:42:54 greg Exp $
 # 
 # Make all the Radiance programs
 #
@@ -72,49 +72,22 @@ if ( ! -d $idir/dev ) then
 		goto again1
 	endif
 endif
+set inpath=0
+foreach i ( $path )
+	if ( "$i" == "$idir" ) then
+		set inpath=1
+		break
+	endif
+end
 set rmake=$idir/rmake
 if ( "`ls -tL $rmake $0 |& head -1`" == $rmake ) then
 	goto gotrmake
 endif
 set newrmake
-goto skiplicense
-cat << _EOF_
-
-                     RADIANCE LICENSE AGREEMENT
-
-Radiance is a registered copyright of The Regents of the University of
-California ("The Regents"). The Regents grant to you a nonexclusive,
-nontransferable license ("License") to use Radiance source code without
-fee.  You may not sell or distribute Radiance to others without the
-prior express written permission of The Regents.  You may compile and
-use this software on any machines to which you have personal access,
-and may share its use with others who have access to the same machines.
-
-NEITHER THE UNITED STATES NOR THE UNITED STATES DEPARTMENT OF ENERGY, NOR ANY
-OF THEIR EMPLOYEES, MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR ASSUMES ANY
-LEGAL LIABILITY OR RESPONSIBILITY FOR THE ACCURACY, COMPLETENESS, OR USEFULNESS
-OF ANY INFORMATION, APPARATUS, PRODUCT, OR PROCESS DISCLOSED, OR REPRESENTS
-THAT ITS USE WOULD NOT INFRINGE PRIVATELY OWNED RIGHTS.  By downloading, using
-or copying this software, you agree to abide by the intellectual property laws
-and all other applicable laws of the United States, and by the terms of this
-License Agreement. Ownership of the software shall remain solely in The
-Regents.  The Regents shall have the right to terminate this License
-immediately by written notice upon your breach of, or noncompliance with, any
-of its terms.  You shall be liable for any infringement or damages resulting
-from your failure to abide by the terms of this License Agreement.
-
-_EOF_
+more src/common/copyright.h
 echo -n "Do you understand and accept the terms of this agreement [n]? "
 set ans="$<"
 if ( "$ans" !~ [yY]* ) exit
-echo -n "Are you a new Radiance user or with a new address [y]? "
-set ans="$<"
-if ( "$ans" !~ [nN]* ) then
-	csh -f newuser
-else
-	echo `cat src/rt/VERSION` compiled by `whoami` | mail radiance-request@floyd.lbl.gov
-endif
-skiplicense:
 set special=
 set arch=
 set opt=
@@ -283,12 +256,20 @@ else
 	echo "Done."
 endif
 cd ..
+if (! $inpath ) then
+	echo ""
+	echo "Add $idir to the beginning of your execution path:"
+	echo 'For C-shell users, put the following into ~/.cshrc'
+	echo "	set path=( $idir "'$path )'
+	echo 'For Bourne shell users, put the following into $HOME/profile'
+	echo "	PATH=$idir"':$PATH'
+	echo "	export PATH"
+endif
 if (! -d /usr/tmp) then
 	ln -s /tmp /usr/tmp
 	if ($status) then
 		echo ""
 		echo "IMPORTANT: Execute 'sudo ln -s /tmp /usr/tmp'"
-		echo ""
 	endif
 endif
 else
@@ -299,13 +280,13 @@ foreach i ( $srcdirs )
 	make -f Rmakefile $*
 	popd
 end
-echo "Done."
 cd ..
-endif
 foreach i ( $* )
 	if ( "$i" == clean ) then
 		echo "Removing library archives..."
 		rm -f src/lib/*.[ao]
 	endif
 end
+echo "Done."
+endif
 exit 0