Index: src/config/abi_defs.mk
===================================================================
RCS file: /cvsroot/abi/src/config/abi_defs.mk,v
retrieving revision 1.105
diff -u -r1.105 abi_defs.mk
--- src/config/abi_defs.mk	2000/08/03 21:18:00	1.105
+++ src/config/abi_defs.mk	2000/08/16 13:28:58
@@ -124,6 +124,12 @@
 OS_NAME = WIN32
 endif
 
+ifeq ($(OS_NAME), WIN32)
+CYGWIN_MAJOR_VERSION := $(shell echo $(OS_RELEASE) | cut -d . -f 1)
+CYGWIN_MINOR_VERSION := $(shell echo $(OS_RELEASE) | cut -d . -f 2)
+CYGWIN_REVISION      := $(shell echo $(OS_RELEASE) | cut -d . -f 3)
+endif
+
 ##################################################################
 ##################################################################
 #### if ABI_OPT_CYGWIN_UNIX is defined then the OS_NAME becomes
@@ -132,6 +138,18 @@
 ifdef ABI_OPT_CYGWIN_UNIX
 ifeq ($(OS_NAME), WIN32)
 OS_NAME = CYGWIN
+endif
+endif
+
+ABI_ESCAPE_QUOTES=NO
+ifeq ($(OS_NAME),WIN32)
+ifeq ($(CYGWIN_MAJOR_VERSION),1)
+ifeq ($(CYGWIN_MINOR_VERSION),1)
+OLD_CYGWIN := $(shell expr $(CYGWIN_REVISION) "<=" 2)
+ifeq ($(OLD_CYGWIN),1)
+ABI_ESCAPE_QUOTES=YES
+endif
+endif
 endif
 endif
 
Index: src/config/abi_defs_wp.mk
===================================================================
RCS file: /cvsroot/abi/src/config/abi_defs_wp.mk,v
retrieving revision 1.9
diff -u -r1.9 abi_defs_wp.mk
--- src/config/abi_defs_wp.mk	1999/12/12 15:07:09	1.9
+++ src/config/abi_defs_wp.mk	2000/08/16 13:28:58
@@ -41,7 +41,7 @@
 
 ifdef ABISOURCE_LICENSED_TRADEMARKS
 
-ifeq ($(OS_NAME),WIN32)
+ifeq ($(ABI_ESCAPE_QUOTES),YES)
 ABI_NAMEDEFS=	-DABIWORD_APP_NAME=\"\"AbiWord\"\"
 else
 ABI_NAMEDEFS=	-DABIWORD_APP_NAME="\"AbiWord\""
@@ -49,7 +49,7 @@
 
 else
 
-ifeq ($(OS_NAME),WIN32)
+ifeq ($(ABI_ESCAPE_QUOTES),YES)
 ABI_NAMEDEFS=	-DABIWORD_APP_NAME=\"\"AbiWord Personal\"\"
 else
 ABI_NAMEDEFS=	-DABIWORD_APP_NAME="\"AbiWord Personal\""
@@ -64,7 +64,7 @@
 ##                  within the application.
 
 ABI_APPLIBDIR=AbiWord
-ifeq ($(OS_NAME),WIN32)
+ifeq ($(ABI_ESCAPE_QUOTES),YES)
 ABI_APPLIBDIRDEF= -DABIWORD_APP_LIBDIR=\"\"AbiWord\"\"
 else
 ABI_APPLIBDIRDEF= -DABIWORD_APP_LIBDIR="\"AbiWord\""
Index: src/wp/main/xp/Makefile
===================================================================
RCS file: /cvsroot/abi/src/wp/main/xp/Makefile,v
retrieving revision 1.5
diff -u -r1.5 Makefile
--- src/wp/main/xp/Makefile	1999/05/23 19:15:05	1.5
+++ src/wp/main/xp/Makefile	2000/08/16 13:28:59
@@ -41,7 +41,7 @@
 endif
 
 ifdef ABI_OPTIONS
-ifeq ($(OS_NAME),WIN32)
+ifeq ($(ABI_ESCAPE_QUOTES),YES)
 BUILD_OPTIONS=		\"$(ABI_OPTIONS)\"
 else
 BUILD_OPTIONS=		"$(ABI_OPTIONS)"