diff -urNwb -x CVS -x WIN32_20.1_i386_OBJ -x WIN32_1.1.1_i386_OBJ ../abi-orig/src/ask/askrm/win/Makefile ./src/ask/askrm/win/Makefile
--- ../abi-orig/src/ask/askrm/win/Makefile	Mon Jun 14 18:32:32 1999
+++ ./src/ask/askrm/win/Makefile	Sat May 20 00:11:26 2000
@@ -48,11 +48,12 @@
 
 $(PROGRAM): $(OBJS) $(THE_LIBS)
 	@$(MAKE_OBJDIR)
+	@$(CLEAN_CYGDRIVE)
 	@echo Linking $(PROGRAM)....
-	@$(CC) $(shell echo $(OBJS) | sed 's|//[a-zA-Z]/|/|g' | sed 's|/|\\\\|g')	\
-		-Fe$(shell echo $@ | sed 's|//[a-zA-Z]/|/|g' | sed 's|/|\\\\|g')	\
+	@$(CC) $(shell echo $(OBJS) | $(TRANSFORM_TO_DOS_PATH))	\
+		-Fe$(shell echo $@ | $(TRANSFORM_TO_DOS_PATH))	\
 		-link $(LDFLAGS) $(OS_LIBS) $(ABI_LDFLAGS)				\
-		$(shell echo $(EXTRA_LIBS) | sed 's|//[a-zA-Z]/|/|g' | sed 's|/|\\\\|g')
+		$(shell echo $(EXTRA_LIBS) | $(TRANSFORM_TO_DOS_PATH))
 
 build:: $(TARGETS)
 	@echo askrm built
diff -urNwb -x CVS -x WIN32_20.1_i386_OBJ -x WIN32_1.1.1_i386_OBJ ../abi-orig/src/ask/gendata/win/Makefile ./src/ask/gendata/win/Makefile
--- ../abi-orig/src/ask/gendata/win/Makefile	Mon Jun 14 18:32:34 1999
+++ ./src/ask/gendata/win/Makefile	Fri May 19 17:06:10 2000
@@ -48,11 +48,12 @@
 
 $(PROGRAM): $(OBJS)
 	@$(MAKE_OBJDIR)
+	@$(CLEAN_CYGDRIVE)
 	@echo Linking $(PROGRAM)....
-	@$(CC) $(shell echo $(OBJS) | sed 's|//[a-zA-Z]/|/|g' | sed 's|/|\\\\|g')	\
-		-Fe$(shell echo $@ | sed 's|//[a-zA-Z]/|/|g' | sed 's|/|\\\\|g')	\
+	@$(CC) $(shell echo $(OBJS) | $(TRANSFORM_TO_DOS_PATH))	\
+		-Fe$(shell echo $@ | $(TRANSFORM_TO_DOS_PATH))	\
 		-link $(LDFLAGS) $(OS_LIBS) $(ABI_LDFLAGS)				\
-		$(shell echo $(EXTRA_LIBS) | sed 's|//[a-zA-Z]/|/|g' | sed 's|/|\\\\|g')
+		$(shell echo $(EXTRA_LIBS) | $(TRANSFORM_TO_DOS_PATH))
 
 build:: $(TARGETS)
 	@echo ask_gendata built
diff -urNwb -x CVS -x WIN32_20.1_i386_OBJ -x WIN32_1.1.1_i386_OBJ ../abi-orig/src/config/abi_defs.mk ./src/config/abi_defs.mk
--- ../abi-orig/src/config/abi_defs.mk	Sat May 20 18:51:14 2000
+++ ./src/config/abi_defs.mk	Fri May 19 17:09:24 2000
@@ -91,8 +91,9 @@
 
 # this makes HP-UX look like "HP" (sed turns "HP-UX" into "HP" with the -.* pattern)
 OS_NAME		:= $(shell uname -s | sed "s/\//-/" | sed "s/_/-/" | sed "s/-.*//g")
-OS_RELEASE	:= $(shell uname -r | sed "s/\//-/" | sed "s/ .*//g")
-####"OS_ARCH is now set in platform/*.mk
+OS_RELEASE	:= $(shell uname -r | sed "s/\//-/" | sed "s/[() ].*//g")
+#"
+####OS_ARCH is now set in platform/*.mk
 
 ##################################################################
 ##################################################################
@@ -165,7 +166,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) | sed 's|//[a-zA-Z]/|/|g')
+ABI_XX_ROOT:=$(shell echo $(ABI_ROOT) | sed 's|/cygdrive/[a-zA-Z]/|/|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))
@@ -292,6 +293,14 @@
 
 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]/|/|g' | sed 's|//[a-zA-Z]/|/|g' | sed 's|/|\\\\|g'
+endef
+
+define CLEAN_CYGDRIVE
+if test -d /cygdrive; then rm -rf /cygdrive; fi
 endef
 
 ##################################################################
diff -urNwb -x CVS -x WIN32_20.1_i386_OBJ -x WIN32_1.1.1_i386_OBJ ../abi-orig/src/config/abi_rules.mk ./src/config/abi_rules.mk
--- ../abi-orig/src/config/abi_rules.mk	Sat Sep 11 10:24:24 1999
+++ ./src/config/abi_rules.mk	Sat May 20 01:10:42 2000
@@ -123,8 +123,9 @@
 $(HELPER_PROGRAM): $(OBJS)
 	@$(MAKE_OBJDIR)
 ifeq ($(OS_NAME),WIN32)
-	@$(CC) -nologo $(shell echo $(OBJS) | sed 's|//[a-zA-Z]/|/|g' | sed 's|/|\\\\|g')	\
-		-Fe$(shell echo $@ | sed 's|//[a-zA-Z]/|/|g' | sed 's|/|\\\\|g')		\
+	@$(CLEAN_CYGDRIVE)
+	@$(CC) -nologo $(shell echo $(OBJS) | $(TRANSFORM_TO_DOS_PATH) )	\
+		-Fe$(shell echo $@ | $(TRANSFORM_TO_DOS_PATH) )		\
 		-link $(LDFLAGS) $(OS_LIBS) $(EXTRA_LIBS)
 else
 	@$(CCC) -o $@ $(CFLAGS) $(OBJS) $(LDFLAGS) 
@@ -138,14 +139,18 @@
 	@$(MAKE_OBJDIR)
 	@rm -f $@
 ifeq ($(OS_NAME),WIN32)
-####	@$(AR) $(shell echo $(OBJS) | sed 's|//[a-zA-Z]/|/|g' | sed 's|/|\\\\|g') $(AR_EXTRA_ARGS)
+####	@$(AR) $(shell echo $(OBJS) | sed 's|/cygdrive/[a-zA-Z]/|/|g' | sed 's|//[a-zA-Z]/|/|g' | sed 's|/|\\\\|g') $(AR_EXTRA_ARGS)
 ####	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 $@ | sed 's|//[a-zA-Z]/|/|g' | sed 's|/|\\\\|g')" 	>linkfile.1
-	@echo $(OBJS) | sed 's|//[a-zA-Z]/|/|g' | sed 's|/|\\|g' 				>linkfile.2
+	@$(CLEAN_CYGDRIVE)
+	@echo -NOLOGO -OUT:"$(shell echo $@ | $(TRANSFORM_TO_DOS_PATH))" > linkfile.1
+	@echo $(OBJS)                               > linkfile.4
+	@sed 's|/cygdrive/[a-zA-Z]/|/|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.[123]
+	@rm linkfile.[123456]
 else
 	@$(AR) $(OBJS) $(AR_EXTRA_ARGS)
 endif
@@ -157,7 +162,8 @@
 	@$(MAKE_OBJDIR)
 	@rm -f $@
 ifeq ($(OS_NAME), WIN32)
-	@$(LINK_DLL) -MAP $(DLLBASE) $(OS_LIBS) $(EXTRA_LIBS) $(subst /,\\,$(OBJS))
+	@$(CLEAN_CYGDRIVE)
+	@$(LINK_DLL) -MAP $(DLLBASE) $(OS_LIBS) $(EXTRA_LIBS) $(shell echo $(OBJS) | $(TRANSFORM_TO_DOS_PATH) )
 else
 	$(MKSHLIB) -o $@ $(OBJS) $(EXTRA_LIBS) $(OS_LIBS)
 endif
@@ -167,7 +173,8 @@
 ifeq ($(OS_NAME), WIN32)
 $(RCOBJS): $(RCSRCS)
 	@$(MAKE_OBJDIR)
-	@$(RC) /fo$(shell echo $(RCOBJS) | sed 's|//[a-zA-Z]/|/|g' | sed 's|/|\\\\|g')	\
+	@$(CLEAN_CYGDRIVE)
+	@$(RC) /fo$(shell echo $(RCOBJS) | $(TRANSFORM_TO_DOS_PATH) )	\
 		$(ABI_INCS) $(ABI_TMDEFS) $(RCSRCS)
 	@echo $(RCOBJS) finished
 endif
@@ -179,7 +186,8 @@
 $(OBJDIR)/%.$(OBJ_SUFFIX): %.cpp
 	@$(MAKE_OBJDIR)
 ifeq ($(OS_NAME), WIN32)
-	@$(CCC) -Fo$(shell echo $@ | sed 's|//[a-zA-Z]/|/|g' | sed 's|/|\\\\|g') -c $(CFLAGS) $<
+	@$(CLEAN_CYGDRIVE)
+	@$(CCC) -Fo$(shell echo $@ | $(TRANSFORM_TO_DOS_PATH) ) -c $(CFLAGS) $<
 else
 	@echo $<:
 	@$(CCC) -o $@ -c $(CFLAGS) $<
@@ -192,8 +200,9 @@
 $(OBJDIR)/%.$(OBJ_SUFFIX): $(OBJDIR)/%.cpp
 	@$(MAKE_OBJDIR)
 ifeq ($(OS_NAME), WIN32)
-	@$(CCC) -Fo$(shell echo $@ | sed 's|//[a-zA-Z]/|/|g' | sed 's|/|\\\\|g') -c	\
-		$(CFLAGS) $(shell echo $< | sed 's|//[a-zA-Z]/|/|g' | sed 's|/|\\\\|g')
+	@$(CLEAN_CYGDRIVE)
+	@$(CCC) -Fo$(shell echo $@ | $(TRANSFORM_TO_DOS_PATH) ) -c	\
+		$(CFLAGS) $(shell echo $< | $(TRANSFORM_TO_DOS_PATH) )
 else
 	@echo $<:
 	@$(CCC) -o $@ -c $(CFLAGS) $<
@@ -206,7 +215,8 @@
 $(OBJDIR)/%.$(OBJ_SUFFIX): %.c
 	@$(MAKE_OBJDIR)
 ifeq ($(OS_NAME), WIN32)
-	@$(CC) -Fo$(shell echo $@ | sed 's|//[a-zA-Z]/|/|g' | sed 's|/|\\\\|g') -c $(CFLAGS) $<
+	@$(CLEAN_CYGDRIVE)
+	@$(CC) -Fo$(shell echo $@ | $(TRANSFORM_TO_DOS_PATH) ) -c $(CFLAGS) $<
 else
 	@echo $<:
 	@$(CC) -o $@ -c $(CFLAGS) $<
@@ -220,8 +230,9 @@
 $(OBJDIR)/%.$(OBJ_SUFFIX): $(OBJDIR)/%.c
 	@$(MAKE_OBJDIR)
 ifeq ($(OS_NAME), WIN32)
-	@$(CC) -Fo$(shell echo $@ | sed 's|//[a-zA-Z]/|/|g' | sed 's|/|\\\\|g') -c	\
-		$(CFLAGS) $(shell echo $< | sed 's|//[a-zA-Z]/|/|g' | sed 's|/|\\\\|g')
+	@$(CLEAN_CYGDRIVE)
+	@$(CC) -Fo$(shell echo $@ | sed $(TRANSFORM_TO_DOS_PATH) ) -c	\
+		$(CFLAGS) $(shell echo $< | $(TRANSFORM_TO_DOS_PATH) )
 else
 	@echo $<:
 	@$(CC) -o $@ -c $(CFLAGS) $<
diff -urNwb -x CVS -x WIN32_20.1_i386_OBJ -x WIN32_1.1.1_i386_OBJ ../abi-orig/src/config/platforms/win32.mk ./src/config/platforms/win32.mk
--- ../abi-orig/src/config/platforms/win32.mk	Fri Jul  9 13:36:58 1999
+++ ./src/config/platforms/win32.mk	Wed May 17 21:24:22 2000
@@ -36,7 +36,7 @@
 CC 	= cl
 CCC 	= cl
 LINK 	= link
-AR 	= lib -NOLOGO -OUT:"$(shell echo $@ | sed 's|//[a-zA-Z]/|/|g' | sed 's|/|\\\\|g')"
+AR 	= lib -NOLOGO -OUT:"$(shell echo $@ | sed 's|/cygdrive/[a-zA-Z]/|/|g' | sed 's|//[a-zA-Z]/|/|g' | sed 's|/|\\\\|g')"
 RANLIB 	= echo
 BSDECHO	= echo
 RC 	= rc.exe
diff -urNwb -x CVS -x WIN32_20.1_i386_OBJ -x WIN32_1.1.1_i386_OBJ ../abi-orig/src/hello/main/win/Makefile ./src/hello/main/win/Makefile
--- ../abi-orig/src/hello/main/win/Makefile	Mon Jun 14 18:32:34 1999
+++ ./src/hello/main/win/Makefile	Fri May 19 17:14:10 2000
@@ -50,8 +50,9 @@
 
 $(PROGRAM): $(OBJS) $(EXTRA_LIBDEP)
 	@$(MAKE_OBJDIR)
+	@$(CLEAN_CYGDRIVE)
 	@echo Linking $(PROGRAM)....
-	@$(CC) $(subst /,\\,$(OBJS)) -Fe$(subst /,\\,$@) -link $(LDFLAGS) $(OS_LIBS) $(ABI_LDFLAGS) $(subst /,\\,$(EXTRA_LIBS))
+	@$(CC) $(shell echo $(OBJS) | $(TRANSFORM_TO_DOS_PATH)) -Fe$(shell echo $@ | $(TRANSFORM_TO_DOS_PATH)) -link $(LDFLAGS) $(OS_LIBS) $(ABI_LDFLAGS) $(shell echo $(EXTRA_LIBS) | $(TRANSFORM_TO_DOS_PATH))
 
 build:: $(TARGETS)
 	@echo Target $(TARGETS) completed.
diff -urNwb -x CVS -x WIN32_20.1_i386_OBJ -x WIN32_1.1.1_i386_OBJ ../abi-orig/src/pkg/win/setup/Makefile ./src/pkg/win/setup/Makefile
--- ../abi-orig/src/pkg/win/setup/Makefile	Wed Jun 16 13:32:14 1999
+++ ./src/pkg/win/setup/Makefile	Fri May 19 17:17:32 2000
@@ -64,13 +64,14 @@
 	sed -e 's|__BINDIR__|$(BINDIR)|g' $(OBJDIR)/_tmp1_.ask > $(OBJDIR)/_tmp2_.ask
 	sed -e 's|__GRAPHICNAME__|$(GRAPHICNAME)|g' $(OBJDIR)/_tmp2_.ask > $(OBJDIR)/_tmp3_.ask
 	$(BINDIR)/ask_gendata.exe $(OBJDIR)/_tmp3_.ask \
-		 $(shell echo $(OBJDIR)/_tmp_.c | sed 's|//[a-zA-Z]/|/|g' | sed 's|/|\\\\|g')
+		 $(shell echo $(OBJDIR)/_tmp_.c | $(TRANSFORM_TO_DOS_PATH))
 	(cd $(OBJDIR); mv _tmp_.c data.c)
 
 $(PROGRAM): $(OBJS)
 	@$(MAKE_OBJDIR)
+	@$(CLEAN_CYGDRIVE)
 	@echo Linking $(PROGRAM)....
-	@$(CC) $(subst /,\\,$(OBJS)) -Fe$(subst /,\\,$@) -link $(LDFLAGS) $(OS_LIBS) $(ABI_LDFLAGS) $(subst /,\\,$(EXTRA_LIBS))
+	@$(CC) $(shell echo $(OBJS) | $(TRANSFORM_TO_DOS_PATH)) -Fe$(shell echo $@ | $(TRANSFORM_TO_DOS_PATH)) -link $(LDFLAGS) $(OS_LIBS) $(ABI_LDFLAGS) $(shell echo $(EXTRA_LIBS) | $(TRANSFORM_TO_DOS_PATH))
 
 ifdef ABI_OPT_DEBUG
 
diff -urNwb -x CVS -x WIN32_20.1_i386_OBJ -x WIN32_1.1.1_i386_OBJ ../abi-orig/src/tools/cdump/win/Makefile ./src/tools/cdump/win/Makefile
--- ../abi-orig/src/tools/cdump/win/Makefile	Mon Jun 14 18:32:34 1999
+++ ./src/tools/cdump/win/Makefile	Fri May 19 17:18:36 2000
@@ -44,10 +44,11 @@
 
 $(PROGRAM): $(OBJS)
 	@$(MAKE_OBJDIR)
+	@$(CLEAN_CYGDRIVE)
 	@echo Linking $(PROGRAM)....
-	@$(CC) $(shell echo $(OBJS) | sed 's|//[a-zA-Z]/|/|g' | sed 's|/|\\\\|g')		\
-		-Fe$(shell echo $@ | sed 's|//[a-zA-Z]/|/|g' | sed 's|/|\\\\|g')		\
-		-link $(LDFLAGS) $(OS_LIBS) $(ABI_LDFLAGS) $(subst /,\\,$(EXTRA_LIBS))
+	@$(CC) $(shell echo $(OBJS) | $(TRANSFORM_TO_DOS_PATH))		\
+		-Fe$(shell echo $@ | $(TRANSFORM_TO_DOS_PATH))		\
+		-link $(LDFLAGS) $(OS_LIBS) $(ABI_LDFLAGS) $(shell echo $(EXTRA_LIBS) | $(TRANSFORM_TO_DOS_PATH))
 
 build:: $(TARGETS)
 	@echo cdump built
diff -urNwb -x CVS -x WIN32_20.1_i386_OBJ -x WIN32_1.1.1_i386_OBJ ../abi-orig/src/wp/main/win/Makefile ./src/wp/main/win/Makefile
--- ../abi-orig/src/wp/main/win/Makefile	Thu Jan 20 12:15:38 2000
+++ ./src/wp/main/win/Makefile	Fri May 19 17:19:12 2000
@@ -51,11 +51,12 @@
 
 $(PROGRAM): $(OBJS) $(EXTRA_LIBDEP)
 	@$(MAKE_OBJDIR)
+	@$(CLEAN_CYGDRIVE)
 	@echo Linking $(PROGRAM)....
-	@$(CC) $(shell echo $(OBJS) | sed 's|//[a-zA-Z]/|/|g' | sed 's|/|\\\\|g')	\
-		-Fe$(shell echo $@ | sed 's|//[a-zA-Z]/|/|g' | sed 's|/|\\\\|g')	\
+	@$(CC) $(shell echo $(OBJS) | $(TRANSFORM_TO_DOS_PATH))	\
+		-Fe$(shell echo $@ | $(TRANSFORM_TO_DOS_PATH))	\
 		-link $(LDFLAGS) $(OS_LIBS) $(ABI_LDFLAGS)				\
-		$(shell echo $(EXTRA_LIBS) | sed 's|//[a-zA-Z]/|/|g' | sed 's|/|\\\\|g')
+		$(shell echo $(EXTRA_LIBS) | $(TRANSFORM_TO_DOS_PATH))
 
 build:: $(TARGETS)
 	@echo Target $(TARGETS) completed.