[patch] apq-2.1 (New package)

apq-2.1-install_lib.patch (text/plain), 2.79 KB, created by Krzysztof Tomczyk on 2006-09-27 01:42:57 UTC

--- install_lib.orig	2006-06-30 15:56:53.085169500 +0200
+++ install_lib	2006-07-03 14:50:31.524710250 +0200
@@ -5,8 +5,8 @@
 #
 # Licensed under the ACL (Ada Community License)
 
-TMPDIR="${TMPDIR:-/tmp}"	# Temp file directory
-TMP="$TMPDIR/$$-1.tmp"		# Temp file 1
+TMP_DIR="${TMP_DIR:-/tmp}"	# Temp file directory
+TMP="$TMP_DIR/$$-1.tmp"		# Temp file 1
 trap "rm -f $TMP" 0		# Clean up temp file(s) on exit
 
 UNINSTALL=0
@@ -74,78 +74,7 @@
 }
 
 check_include() {
-	AVAR="$1"
-	eval "APATH=\"\$$AVAR\""
-	(	
-		if is_unix ; then
-			IFS=:
-		else
-			IFS=';'
-		fi
-		for dir in $APATH ; do
-			if is_unix ; then
-				echo "$dir"
-			else
-				echo $(cygpath "$dir")
-			fi
-		done
-	) | (
-		rc=1
-		while read dir ; do
-			if [ -w "$dir" ] ; then
-				rc=0
-				echo "$dir"
-			fi
-		done
-	) >$TMP
-	if [ $? -ne 0 ] ; then
-		cat <<EOF >/dev/tty
-----------------------------------------------------------------------
-None of the directories in $AVAR are writable by $LOGNAME.
-
-You will need to either gain access to one directory referenced
-by $AVAR, or you will need to create a local directory and append
-that to the list int $AVAR.
-
-Try make install again, after you take care of this issue.
-----------------------------------------------------------------------
-EOF
-		exit 1		
-	fi
-	count=$(wc -l <$TMP)
-	if [ $count -gt 1 ] ; then
-		loop=true
-		while $loop ; do
-			cat <<EOF >/dev/tty
-----------------------------------------------------------------------
-There is more than one writable directory in $AVAR that I could use.
-
-Please enter the line number you want to choose below:
-
-EOF
-			cat -n $TMP >/dev/tty
-			echo >/dev/tty
-			echo "Enter your choice below (q to quit)?" >/dev/tty
-			read selection </dev/tty
-
-			case "$selection" in
-			q* | Q* )	 echo "Try again later."; exit 1;;
-			* )		;;
-			esac
-			
-			if [ $selection -gt 0 -a $selection -le $count ] ; then
-				loop=false
-				continue
-			fi
-			echo >/dev/tty
-			echo "Choose a number between 1 and $count please." >/dev/tty
-			echo >/dev/tty
-		done
-		dir=$(sed -n ${selection}p <$TMP)
-	else
-		dir=$(cat $TMP)
-	fi
-	echo "$dir"
+	echo "/usr/lib/ada/adainclude"
 }
 
 check_instfile() {
@@ -163,7 +92,7 @@
 install_files() {
 	INSTVAR="$1"
 	eval INSTLST="\$$INSTVAR"
-	INSTDIR="$2"
+	INSTDIR=${D}"$2"
 	INSTMODE="$3"
 	for file in $INSTLST ; do
 		if [ ! -r $file ] ; then
@@ -181,7 +110,7 @@
 uninstall_files() {
 	INSTVAR="$1"
 	eval INSTLST="\$$INSTVAR"
-	INSTDIR="$2"
+	INSTDIR=${D}"$2"
 	INSTMODE="$3"
 	for file in $INSTLST ; do
 		if [ -f "$INSTDIR/$file" ] ; then
@@ -251,13 +180,6 @@
 fi
 
 echo
-echo "Ready to continue install? Press RETURN (Q or ^C to quit)" >/dev/tty
-read reply </dev/tty
-
-case "$reply" in
-Q* | q* )	exit 1;;
-* )		;;
-esac
 
 install_files INSTSPEC $INCLDIR 444
 install_files INSTALIS $OBJSDIR 444