diff --git a/contrib/mSQL-interface/Makefile b/contrib/mSQL-interface/Makefile
index 3d99d538c5fb58a7e2a58ca0cefc8bce6a9328e7..fb2a99c405313f303f55cca14a43002afcfa1506 100644
--- a/contrib/mSQL-interface/Makefile
+++ b/contrib/mSQL-interface/Makefile
@@ -1,11 +1,12 @@
 #
-# $PostgreSQL: pgsql/contrib/mSQL-interface/Makefile,v 1.11 2005/12/09 21:19:34 petere Exp $
+# $PostgreSQL: pgsql/contrib/mSQL-interface/Makefile,v 1.12 2006/07/15 03:33:14 tgl Exp $
 #
 
-NAME	= mpgsql
+MODULE_big = mpgsql
 SO_MAJOR_VERSION = 0
 SO_MINOR_VERSION = 0
 OBJS	= mpgsql.o
+DOCS = README.mpgsql
 
 PG_CPPFLAGS = -I$(libpq_srcdir)
 
@@ -18,17 +19,3 @@ top_builddir = ../..
 include $(top_builddir)/src/Makefile.global
 include $(top_srcdir)/contrib/contrib-global.mk
 endif
-
-all: all-lib
-
-install: all installdirs install-lib
-	$(INSTALL_DATA) $(srcdir)/README.$(NAME) '$(DESTDIR)$(docdir)/contrib'
-
-installdirs:
-	$(mkinstalldirs) $(libdir) '$(DESTDIR)$(docdir)/contrib'
-
-uninstall: uninstall-lib
-	rm -f '$(DESTDIR)$(docdir)/contrib/README.$(NAME)'
-
-clean distclean maintainer-clean: clean-lib
-	rm -f $(OBJS)
diff --git a/contrib/tsearch2/Makefile b/contrib/tsearch2/Makefile
index 393e3fa902c5ff836b39864720fd9df26f837265..c529f2b50525156f193d9baaabe345de666018ff 100644
--- a/contrib/tsearch2/Makefile
+++ b/contrib/tsearch2/Makefile
@@ -1,4 +1,4 @@
-# $PostgreSQL: pgsql/contrib/tsearch2/Makefile,v 1.15 2006/05/31 14:05:31 teodor Exp $
+# $PostgreSQL: pgsql/contrib/tsearch2/Makefile,v 1.16 2006/07/15 03:33:14 tgl Exp $
 
 MODULE_big = tsearch2
 OBJS = dict_ex.o dict.o snmap.o stopword.o common.o prs_dcfg.o \
@@ -37,6 +37,8 @@ endif
 
 $(SUBDIROBJS): $(SUBDIRS:%=%-recursive) ;
 
+.PHONY: $(SUBDIRS:%=%-recursive)
+
 $(SUBDIRS:%=%-recursive):
 	$(MAKE) -C $(subst -recursive,,$@) SUBSYS.o
 
diff --git a/src/backend/port/nextstep/Makefile b/src/backend/port/nextstep/Makefile
index 7b65e7b84b338c55f7f5879f6215dc200c3895ba..efca19dc87be96ea9f6c5c2268829f9391274813 100644
--- a/src/backend/port/nextstep/Makefile
+++ b/src/backend/port/nextstep/Makefile
@@ -4,7 +4,7 @@
 #    Makefile for port/nextstep
 #
 # IDENTIFICATION
-#    $PostgreSQL: pgsql/src/backend/port/nextstep/Makefile,v 1.8 2003/11/29 19:51:54 pgsql Exp $
+#    $PostgreSQL: pgsql/src/backend/port/nextstep/Makefile,v 1.9 2006/07/15 03:33:14 tgl Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -12,7 +12,7 @@ subdir = src/backend/port/nextstep
 top_builddir = ../../../..
 include $(top_builddir)/src/Makefile.global
 
-OBJS = dynloader.o port.o
+OBJS = port.o
 
 all: SUBSYS.o
 
diff --git a/src/backend/utils/Makefile b/src/backend/utils/Makefile
index d48db1e8188a5bea48f3c21fa294ded9c3b42800..5c3c20b815d36ee87a62645f3b7411a2d7c68940 100644
--- a/src/backend/utils/Makefile
+++ b/src/backend/utils/Makefile
@@ -1,10 +1,10 @@
 #
 # Makefile for utils
 #
-# $PostgreSQL: pgsql/src/backend/utils/Makefile,v 1.23 2004/07/17 03:29:15 tgl Exp $
+# $PostgreSQL: pgsql/src/backend/utils/Makefile,v 1.24 2006/07/15 03:33:14 tgl Exp $
 #
 
-subdir = src/backend/utils/
+subdir = src/backend/utils
 top_builddir = ../../..
 include $(top_builddir)/src/Makefile.global
 
diff --git a/src/bin/pgevent/Makefile b/src/bin/pgevent/Makefile
index 23a4d9ce3e967f3cb9637e21050cb6e3c2c3b785..42460a9882215d026bb75e6274214b0d43915aed 100644
--- a/src/bin/pgevent/Makefile
+++ b/src/bin/pgevent/Makefile
@@ -12,6 +12,8 @@ subdir = src/bin/pgevent
 top_builddir = ../../..
 include $(top_builddir)/src/Makefile.global
 
+ifeq ($(PORTNAME), win32)
+
 OBJS=pgevent.o pgmsgevent.o
 NAME=pgevent.dll
 
@@ -21,7 +23,7 @@ install: all install-lib
 
 pgevent.dll: $(OBJS) pgevent.def
 	dllwrap --def pgevent.def -o $(NAME) $(OBJS)
-	
+
 pgmsgevent.o: pgmsgevent.rc win32ver.rc
 	windres pgmsgevent.rc -o pgmsgevent.o --include-dir=$(top_builddir)/src/include
 
@@ -38,3 +40,5 @@ clean distclean:
 
 clean-lib:
 	rm -f $(NAME)
+
+endif
diff --git a/src/interfaces/ecpg/include/Makefile b/src/interfaces/ecpg/include/Makefile
index 9090be13cddf4479415b5e5cffe5b6eb9d453c04..1b5b14131158bc3b85833ffd78eb7570eb24c44c 100644
--- a/src/interfaces/ecpg/include/Makefile
+++ b/src/interfaces/ecpg/include/Makefile
@@ -2,6 +2,9 @@ subdir = src/interfaces/ecpg/include
 top_builddir = ../../../..
 include $(top_builddir)/src/Makefile.global
 
+override CPPFLAGS := -DFRONTEND -I$(top_srcdir)/src/interfaces/ecpg/include \
+	-I$(libpq_srcdir) -I$(top_builddir)/src/port $(CPPFLAGS)
+
 informix_esql_dir = $(pkgincludedir)/informix/esql
 
 install: all installdirs install-headers