diff -urNwb -x CVS -x WIN32_1.1.2s_i386_OBJ ./src/config/abi_defs.mk ../abi-orig/src/config/abi_defs.mk
--- ./src/config/abi_defs.mk	Wed Jun  7 01:53:44 2000
+++ ../abi-orig/src/config/abi_defs.mk	Mon Jun  5 08:56:36 2000
@@ -120,38 +120,6 @@
 
 ##################################################################
 ##################################################################
-## Macros which help eliminate our need for a working copy of the
-## INSTALL program...
-
-define MAKE_OBJDIR
-if test ! -d $(@D); then rm -rf $(@D); mkdir -p $(@D); fi
-endef
-
-define VERIFY_DIRECTORY
-if test ! -d xxxx; then rm -rf xxxx; mkdir -p  xxxx; fi
-endef
-
-ifeq ($(OS_NAME), WIN32)
-CYGWIN_ROOT := $(shell cygpath -w / | sed 's|\\|/|g')
- ifneq (,$(findstring  ,$(shell uname -r)))
-  define TRANSFORM_TO_DOS_PATH
-  sed 's|//[a-zA-Z]/|/|g' | sed 's|/|\\\\|g'
-  endef
- else
-  ifneq (,$(findstring cygdrive,$(ABI_ROOT)))
-   define TRANSFORM_TO_DOS_PATH
-   sed 's|/cygdrive/\([a-zA-Z]\)/|\1:/|g' | sed 's|/|\\\\|g'
-   endef
-  else
-   define TRANSFORM_TO_DOS_PATH
-   sed 's|/|$(CYGWIN_ROOT)|' | sed 's| /| $(CYGWIN_ROOT)|g' | sed 's|/|\\\\|g'
-   endef
-  endif
- endif
-endif
-
-##################################################################
-##################################################################
 
 ABICOPY=cp
 
@@ -197,7 +165,7 @@
 
 ABI_ALL_INCS=	$(ABI_XAP_INCS) $(ABI_PEER_INCS) $(ABI_AP_INCS) $(ABI_OTH_INCS) $(ABI_TM_INCS)
 ifeq ($(OS_NAME), WIN32)
-ABI_XX_ROOT:=$(shell echo $(ABI_ROOT) | $(TRANSFORM_TO_DOS_PATH) | sed 's|\\\\|/|g')
+ABI_XX_ROOT:=$(shell echo $(ABI_ROOT) | sed 's|/cygdrive/\([a-zA-Z]\)/|\1:/|g' | sed 's|//[a-zA-Z]/|/|g')
 ABI_INCS=	$(addprefix -I$(ABI_XX_ROOT)/src,$(ABI_ALL_INCS))
 else
 ABI_INCS=	$(addprefix -I$(ABI_ROOT)/src,$(ABI_ALL_INCS))
@@ -310,7 +278,27 @@
 endif
 
 #### End of platform defs
-#################################################################
+##################################################################
+##################################################################
+
+##################################################################
+##################################################################
+## Macros which help eliminate our need for a working copy of the
+## INSTALL program...
+
+define MAKE_OBJDIR
+if test ! -d $(@D); then rm -rf $(@D); mkdir -p $(@D); fi
+endef
+
+define VERIFY_DIRECTORY
+if test ! -d xxxx; then rm -rf xxxx; mkdir -p  xxxx; fi
+endef
+
+define TRANSFORM_TO_DOS_PATH
+sed 's|/cygdrive/\([a-zA-Z]\)/|\1:/|g' | sed 's|//[a-zA-Z]/|/|g' | sed 's|/|\\\\|g'
+endef
+
+##################################################################
 ##################################################################
 ## Directory name pattern and locations of where we put our output.
 ##
diff -urNwb -x CVS -x WIN32_1.1.2s_i386_OBJ ./src/config/abi_rules.mk ../abi-orig/src/config/abi_rules.mk
--- ./src/config/abi_rules.mk	Wed Jun  7 01:17:54 2000
+++ ../abi-orig/src/config/abi_rules.mk	Mon Jun  5 08:56:36 2000
@@ -142,7 +142,10 @@
 ####	we build a @file because the command line can overrun the win32 bash
 ####	command line limit (or something which crashes bash)....
 	@echo -NOLOGO -OUT:"$(shell echo $@ | $(TRANSFORM_TO_DOS_PATH))" > linkfile.1
-	@echo $(OBJS) | $(TRANSFORM_TO_DOS_PATH) | sed 's|\\\\|\\|g'     > linkfile.2
+	@echo $(OBJS)                               > linkfile.4
+	@sed 's|/cygdrive/\([a-zA-Z]\)/|\1:/|g' linkfile.4 > linkfile.5
+	@sed 's|//[a-zA-Z]/|/|g'         linkfile.5 > linkfile.6
+	@sed 's|/|\\|g'                  linkfile.6 > linkfile.2
 	@echo $(AR_EXTRA_ARGS)									         >linkfile.3
 	@lib @linkfile.1 @linkfile.2 @linkfile.3
 	@rm linkfile.[123456]