diff -upr apache_2.0a4.orig/src/Makefile.in apache_2.0a4/src/Makefile.in
--- apache_2.0a4.orig/src/Makefile.in	Tue May 16 11:57:27 2000
+++ apache_2.0a4/src/Makefile.in	Fri Jul 14 16:44:14 2000
@@ -65,11 +65,11 @@ install-support:
 	@echo Installing Support Binaries
 	@test -d $(bindir) || $(mkinstalldirs) $(bindir)
 	@cp -p $(srcdir)/support/httpd.exp $(bindir)
-	@cp -p $(builddir)/support/htpasswd $(bindir)
-	@cp -p $(builddir)/support/htdigest $(bindir)
-	@cp -p $(builddir)/support/rotatelogs $(bindir)
-	@cp -p $(builddir)/support/logresolve $(bindir)
-	@cp -p $(builddir)/support/ab $(bindir)
+	@install $(builddir)/support/htpasswd $(bindir)
+	@install $(builddir)/support/htdigest $(bindir)
+	@install $(builddir)/support/rotatelogs $(bindir)
+	@install $(builddir)/support/logresolve $(bindir)
+	@install $(builddir)/support/ab $(bindir)
 
 install-other:
 	@test -d $(logdir) || $(mkinstalldirs) $(logdir)
diff -upr apache_2.0a4.orig/src/helpers/install.sh apache_2.0a4/src/helpers/install.sh
--- apache_2.0a4.orig/src/helpers/install.sh	Tue Aug 24 06:50:38 1999
+++ apache_2.0a4/src/helpers/install.sh	Fri Jul 14 16:44:14 2000
@@ -88,6 +88,7 @@ if [ -d $dst ]; then
 fi
 
 #  Add a possible extension (such as ".exe") to src and dst
+if [ -f $src.exe ]; then ext=".exe"; fi
 src="$src$ext"
 dst="$dst$ext"
 
diff -upr apache_2.0a4.orig/src/lib/apr/file_io/unix/pipe.c apache_2.0a4/src/lib/apr/file_io/unix/pipe.c
--- apache_2.0a4.orig/src/lib/apr/file_io/unix/pipe.c	Sun Apr 30 22:17:55 2000
+++ apache_2.0a4/src/lib/apr/file_io/unix/pipe.c	Fri Jul 14 16:44:14 2000
@@ -127,9 +127,12 @@ ap_status_t ap_create_namedpipe(char *fi
 {
     mode_t mode = ap_unix_get_fileperms(perm);
 
+#if 0
     if (mkfifo(filename, mode) == -1) {
         return errno;
     }
+#endif
+    return ENOSYS;
     return APR_SUCCESS;
 } 
 
diff -upr apache_2.0a4.orig/src/lib/pcre/Makefile.in apache_2.0a4/src/lib/pcre/Makefile.in
--- apache_2.0a4.orig/src/lib/pcre/Makefile.in	Tue May 16 11:57:28 2000
+++ apache_2.0a4/src/lib/pcre/Makefile.in	Fri Jul 14 16:44:14 2000
@@ -174,7 +174,7 @@ install:        all
 		  echo $(CC) $(CFLAGS) -o pcretest pcretest.o -L$(LIBDIR) -lpcre -lpcreposix; \
 		  $(CC) $(CFLAGS) -o pcretest pcretest.o -L$(LIBDIR) -lpcre -lpcreposix; \
 		fi
-		$(INSTALL)	pgrep $(BINDIR)/pgrep
+		$(INSTALL)	pgrep.exe $(BINDIR)/pgrep.exe
 		$(INSTALL)	pcre-config $(BINDIR)/pcre-config
 
 # We deliberately omit dftables and chartables.c from 'make clean'; once made
diff -upr apache_2.0a4.orig/src/lib/pcre/pcre.in apache_2.0a4/src/lib/pcre/pcre.in
--- apache_2.0a4.orig/src/lib/pcre/pcre.in	Sat May  6 00:28:22 2000
+++ apache_2.0a4/src/lib/pcre/pcre.in	Fri Jul 14 16:44:14 2000
@@ -13,7 +13,7 @@
 
 /* Win32 uses DLL by default */
 
-#ifdef _WIN32
+#if defined(_WIN32) && !defined(__CYGWIN__)
 # ifdef STATIC
 #  define PCRE_DL_IMPORT
 # else
diff -upr apache_2.0a4.orig/src/main/util.c apache_2.0a4/src/main/util.c
--- apache_2.0a4.orig/src/main/util.c	Sun May 21 06:31:07 2000
+++ apache_2.0a4/src/main/util.c	Fri Jul 14 16:44:14 2000
@@ -1951,7 +1951,9 @@ static char *find_fqdn(ap_pool_t *a, str
 		(!strncasecmp(p->h_aliases[x], p->h_name, strlen(p->h_name))))
 		return ap_pstrdup(a, p->h_aliases[x]);
 	}
+#if 0
 	return NULL;
+#endif
     }
     return ap_pstrdup(a, (void *) p->h_name);
 }
diff -upr apache_2.0a4.orig/src/support/logresolve.c apache_2.0a4/src/support/logresolve.c
--- apache_2.0a4.orig/src/support/logresolve.c	Thu Apr 27 05:22:57 2000
+++ apache_2.0a4/src/support/logresolve.c	Fri Jul 14 17:21:41 2000
@@ -98,8 +98,10 @@ struct nsrec {
  * statistics - obvious
  */
 
+#if 0
 #ifndef h_errno
 extern int h_errno; /* some machines don't have this in their headers */
+#endif
 #endif
 
 /* largest value for h_errno */