Commit a26081b5 authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

A Kevin Roth patch. -- It's a post 1.4.2 patch that will become part of 

libtool 1.4.3, and it's required to allow "make install" to function properly
on cygwin.
parent aa9c01ad

ltmain.sh

+21 −7
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ modename="$progname" 
PROGRAM=ltmain.sh

PACKAGE=libtool

VERSION=1.4.2

TIMESTAMP=" (1.922.2.53 2001/09/11 03:18:52)"

TIMESTAMP=" (1.922.2.54 2001/09/11 03:33:37)"



default_mode=

help="Try \`$progname --help' for more information."
@@ -4273,19 +4273,31 @@ relink_command=\"$relink_command\"" 
	fi



	# Do a test to see if this is really a libtool program.

	if (sed -e '4q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then

	#if (sed -e '4q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then

	case $host in

	*cygwin*|*mingw*)

	    wrapper=`echo $file | sed -e 's,.exe$,,'`

	    ;;

	*)

	    wrapper=$file

	    ;;

	esac

	if (sed -e '4q' $wrapper | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then



	  notinst_deplibs=

	  relink_command=



	  # If there is no directory component, then add one.

	  case $file in

	  */* | *\\*) . $file ;;

	  *) . ./$file ;;

	  #*/* | *\\*) . $file ;;

	  #*) . ./$file ;;

	  */* | *\\*) . $wrapper ;;

	  *) . ./$wrapper ;;

	  esac



	  # Check the variables that should have been set.

	  if test -z "$notinst_deplibs"; then

	    $echo "$modename: invalid libtool wrapper script \`$file'" 1>&2

	    $echo "$modename: invalid libtool wrapper script \`$wrapper'" 1>&2

	    exit 1

	  fi
@@ -4310,8 +4322,10 @@ relink_command=\"$relink_command\"" 
	  relink_command=

	  # If there is no directory component, then add one.

	  case $file in

	  */* | *\\*) . $file ;;

	  *) . ./$file ;;

	  #*/* | *\\*) . $file ;;

	  #*) . ./$file ;;

	  */* | *\\*) . $wrapper ;;

	  *) . ./$wrapper ;;

	  esac



	  outputname=