Diff of /sml/trunk/config/install.sh

Parent Directory | Revision Log | Patch

	revision 630, Wed Apr 26 18:40:56 2000 UTC	revision 631, Fri Apr 28 08:30:52 2000 UTC
#	Line 67	Line 67
67	TOOLDIR=$BINDIR	TOOLDIR=$BINDIR
68
69	#	#
70		# A temporary file for post-editing the pathconfig file...
71		#
72		PCEDITTMP=/usr/tmp/pcedittmp.$$
73
74		#
75	# files to be deleted after we are done...	# files to be deleted after we are done...
76	#	#
77	tmpfiles=""	tmpfiles=""
#	Line 74	Line 79
79	tmpfiles="$tmpfiles $LIBLIST"	tmpfiles="$tmpfiles $LIBLIST"
80	tmpfiles="$tmpfiles $LOCALPATHCONFIG"	tmpfiles="$tmpfiles $LOCALPATHCONFIG"
81	tmpfiles="$tmpfiles $LIBMOVESCRIPT"	tmpfiles="$tmpfiles $LIBMOVESCRIPT"
82		tmpfiles="$tmpfiles $PCEDITTMP"
83	#	#
84	# make sure we always clean up after ourselves...	# make sure we always clean up after ourselves...
85	#	#
#	Line 334	Line 340
340	reglib() {	reglib() {
341	if [ x$MOVE_LIBRARIES = xtrue ] ; then	if [ x$MOVE_LIBRARIES = xtrue ] ; then
342	FINALLOCATION=$LIBDIR/$1	FINALLOCATION=$LIBDIR/$1
343		FINALCONFIGPATH=$1
344	else	else
345	FINALLOCATION=$SRCDIR/$2	FINALLOCATION=$SRCDIR/$2
346		FINALCONFIGPATH=$FINALLOCATION
347	fi	fi
348	if [ -d $FINALLOCATION/CM/$ARCH-unix ] ; then	if [ -d $FINALLOCATION/CM/$ARCH-unix ] ; then
349	echo "$this: Library $1 already exists in $FINALLOCATION."	echo "$this: Library $1 already exists in $FINALLOCATION."
#	Line 346	Line 354
354	if [ x$MOVE_LIBRARIES = xtrue ] ; then	if [ x$MOVE_LIBRARIES = xtrue ] ; then
355	echo movelibs $SRCDIR/$2 $1 >>$LIBMOVESCRIPT	echo movelibs $SRCDIR/$2 $1 >>$LIBMOVESCRIPT
356	fi	fi
	echo $1 $FINALLOCATION >>$CM_PATHCONFIG_DEFAULT
357	fi	fi
358		echo $1 $FINALCONFIGPATH >>$CM_PATHCONFIG_DEFAULT
359	}	}
360
361	#	#
#	Line 644	Line 652
652	fi	fi
653
654	#	#
655	# Finally, move the libraries to their final locations...	# Move the libraries to their final locations...
656	#	#
657
658	if [ -r $LIBMOVESCRIPT ] ; then	if [ -r $LIBMOVESCRIPT ] ; then
#	Line 652	Line 660
660	. $LIBMOVESCRIPT	. $LIBMOVESCRIPT
661	fi	fi
662
663		#
664		# Finally, remove duplicate entries from pathconfig file...
665		#
666		if [ -f $CM_PATHCONFIG_DEFAULT ] ; then
667		cp $CM_PATHCONFIG_DEFAULT $PCEDITTMP
668		rm -f $CM_PATHCONFIG_DEFAULT
669		awk <$PCEDITTMP 'NF == 2 { mapping[$1] = $2 }
670		NF != 2 { print $0 }
671		END { for (i in mapping) print i, mapping[i] }' \
672		| sort >$CM_PATHCONFIG_DEFAULT
673		fi
674
675	exit 0	exit 0

---

Colored Diff Long Colored Diff Unidiff Context Diff Side by Side

Legend: Removed from v.630   changed lines   Added in v.631

---

root@smlnj-gforge.cs.uchicago.edu	ViewVC Help
Powered by ViewVC 1.0.0