At Corinna Vinschen's request, change CygWin32 to Cygwin

5 files changed, 17 insertions, 13 deletions

diff --git a/CHANGES b/CHANGES
index db1916c179..e2b130fccd 100644
--- a/CHANGES
+++ b/CHANGES
@@ -43,7 +43,7 @@
          *) applies to 0.9.6a ... 0.9.6d and 0.9.7
          +) applies to 0.9.7 only
 
-  *) 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]
 
diff --git a/Configure b/Configure
index 1e82476050..e90c8a5cb4 100755
--- a/Configure
+++ b/Configure
@@ -503,9 +503,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 -O3 -m486 -Wall::(unknown):CYGWIN32::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::win32",
-"CygWin32", "gcc:-DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall:::CYGWIN32::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::win32:cygwin-shared::.dll",
+# Cygwin
+"Cygwin-pre1.3", "gcc:-DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall::(unknown):CYGWIN32::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::win32",
+"Cygwin", "gcc:-DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall:::CYGWIN32::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):::::::",
@@ -875,13 +875,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 "";
 
diff --git a/Makefile.org b/Makefile.org
index c05fa0587c..81d2a5eb9c 100644
--- a/Makefile.org
+++ b/Makefile.org
@@ -240,7 +240,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
@@ -703,7 +703,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 \
diff --git a/TABLE b/TABLE
index 6cde82aa21..624789a53c 100644
--- a/TABLE
+++ b/TABLE
@@ -72,7 +72,7 @@ $shared_ldflag =
 $shared_extension = 
 $ranlib       = 
 
-*** CygWin32
+*** Cygwin
 $cc           = gcc
 $cflags       = -DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall
 $unistd       = 
@@ -96,7 +96,7 @@ $shared_ldflag = .dll
 $shared_extension = 
 $ranlib       = 
 
-*** CygWin32-pre1.3
+*** Cygwin-pre1.3
 $cc           = gcc
 $cflags       = -DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall
 $unistd       = 
diff --git a/config b/config
index 229c131b67..3c7c4adb2e 100755
--- a/config
+++ b/config
@@ -335,10 +335,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
@@ -678,8 +678,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