d1d6c2
diff --git a/src/Makefile b/src/Makefile
d1d6c2
index febbced..9737b55 100644
d1d6c2
--- a/src/Makefile
d1d6c2
+++ b/src/Makefile
d1d6c2
@@ -20,7 +20,6 @@ SUBDIRS = \
d1d6c2
 	backend/utils/mb/conversion_procs \
d1d6c2
 	backend/snowball \
d1d6c2
 	include \
d1d6c2
-	interfaces \
d1d6c2
 	backend/replication/libpqwalreceiver \
d1d6c2
 	backend/replication/pgoutput \
d1d6c2
 	fe_utils \
d1d6c2
diff --git a/src/Makefile.global.in b/src/Makefile.global.in
d1d6c2
index 4ed5174..d0e0dae 100644
d1d6c2
--- a/src/Makefile.global.in
d1d6c2
+++ b/src/Makefile.global.in
d1d6c2
@@ -457,7 +457,7 @@ endif
d1d6c2
 
d1d6c2
 # This macro is for use by libraries linking to libpq.  (Because libpgport
d1d6c2
 # isn't created with the same link flags as libpq, it can't be used.)
d1d6c2
-libpq = -L$(libpq_builddir) -lpq
d1d6c2
+libpq = -lpq
d1d6c2
 
d1d6c2
 # This macro is for use by client executables (not libraries) that use libpq.
d1d6c2
 # We force clients to pull symbols from the non-shared libraries libpgport
d1d6c2
@@ -483,7 +483,6 @@ endif
d1d6c2
 # Commonly used submake targets
d1d6c2
 
d1d6c2
 submake-libpq:
d1d6c2
-	$(MAKE) -C $(libpq_builddir) all
d1d6c2
 
d1d6c2
 submake-libpgport:
d1d6c2
 	$(MAKE) -C $(top_builddir)/src/port all