Commit 44bbfcdd authored by Richard Levitte's avatar Richard Levitte
Browse files

At Corinna Vinschen's request, change CygWin32 to Cygwin

parent 6b7b2779

CHANGES

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 


 Changes between 0.9.6c and 0.9.6d  [XX xxx XXXX]



  *) Add information about CygWin32 1.3 and on, and preserve proper

  *) Add information about CygWin 1.3 and on, and preserve proper

     configuration for the versions before that.

     [Corinna Vinschen <vinschen@redhat.com> and Richard Levitte]

Configure

+8 −4
Original line number Diff line number Diff line
@@ -467,9 +467,9 @@ my %table=( 
# and its library files in util/pl/*)

"Mingw32", "gcc:-DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall::::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::win32",



# CygWin32

"CygWin32-pre1.3", "gcc:-DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O2 -m486 -Wall::(unknown)::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::win32",

"CygWin32", "gcc:-DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O2 -m486 -Wall::::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::win32:cygwin-shared::.dll",

# Cygwin

"Cygwin-pre1.3", "gcc:-DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O2 -m486 -Wall::(unknown)::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::win32",

"Cygwin", "gcc:-DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O2 -m486 -Wall::::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::win32:cygwin-shared::.dll",



# Ultrix from Bernhard Simon <simon@zid.tuwien.ac.at>

"ultrix-cc","cc:-std1 -O -Olimit 1000 -DL_ENDIAN::(unknown)::::::",
@@ -723,13 +723,17 @@ if ($target eq "LIST") { 
	exit 0;

}



if ($target =~ m/^CygWin32(-.*)$/) {

	$target = "Cygwin".$1;

}



print "Configuring for $target\n";



&usage if (!defined($table{$target}));



my $IsWindows=scalar grep /^$target$/,@WinTargets;



$exe_ext=".exe" if ($target eq "CygWin32");

$exe_ext=".exe" if ($target eq "Cygwin");

$openssldir="/usr/local/ssl" if ($openssldir eq "" and $prefix eq "");

$prefix=$openssldir if $prefix eq "";

Makefile.org

+2 −2
Original line number Diff line number Diff line
@@ -236,7 +236,7 @@ clean-shared: 
			done; \

		fi; \

		( set -x; rm -f lib$$i$(SHLIB_EXT) ); \

		if [ "$(PLATFORM)" = "CygWin32" ]; then \

		if [ "$(PLATFORM)" = "Cygwin" ]; then \

			( set -x; rm -f cyg$$i$(SHLIB_EXT) lib$$i$(SHLIB_EXT).a ); \

		fi; \

	done
@@ -652,7 +652,7 @@ install: all install_docs 
		do \

			if [ -f "$$i" -o -f "$$i.a" ]; then \

			(       echo installing $$i; \

				if [ "$(PLATFORM)" != "CygWin32" ]; then \

				if [ "$(PLATFORM)" != "Cygwin" ]; then \

					cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/lib; \

					chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i; \

				else \

config

+4 −4
Original line number Diff line number Diff line
@@ -301,10 +301,10 @@ case "${SYSTEM}:${RELEASE}:${VERSION}:${MACHINE}" in 
    CYGWIN*)

	case "$RELEASE" in

	    [bB]*|1.0|1.[12].*)

		echo "${MACHINE}-whatever-cygwin32_pre1.3"

		echo "${MACHINE}-whatever-cygwin_pre1.3"

		;;

	    *)

		echo "${MACHINE}-whatever-cygwin32"

		echo "${MACHINE}-whatever-cygwin"

		;;

	esac

	exit 0
@@ -589,8 +589,8 @@ EOF 
  # *-aix) OUT="aix-$CC" ;;

  # *-dgux) OUT="dgux" ;;

  mips-sony-newsos4) OUT="newsos4-gcc" ;;

  *-*-cygwin32_pre1.3) OUT="CygWin32-pre1.3" ;;

  *-*-cygwin32) OUT="CygWin32" ;;

  *-*-cygwin_pre1.3) OUT="Cygwin-pre1.3" ;;

  *-*-cygwin) OUT="Cygwin" ;;

  *) OUT=`echo $GUESSOS | awk -F- '{print $3}'`;;

esac