3 files changed, 20 insertions, 16 deletions
diff --git a/src/interfaces/libpq/Makefile b/src/interfaces/libpq/Makefile
index 7d35ed0ebf2..bb00e630667 100644
--- a/src/interfaces/libpq/Makefile
+++ b/src/interfaces/libpq/Makefile
@@ -7,7 +7,7 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/interfaces/libpq/Makefile,v 1.12 1996/11/04 06:32:59 bryanh Exp $
+#    $Header: /cvsroot/pgsql/src/interfaces/libpq/Makefile,v 1.13 1996/11/08 06:02:25 momjian Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -33,21 +33,22 @@ VPATH:=$(VPATH):../backend/port/$(PORTNAME)
 OBJS+= getcwd.o putenv.o
 endif
 
-ifdef LINUX_ELF
-shlib := libpq.so.1
-else
 shlib := 
+ifdef LINUX_ELF
+ifeq ($(PORTNAME), linux)
+shlib := obj/libpq.so.1
+endif
 endif
 
-all: libpq.a $(shlib) postgres.h c.h
+all: obj/libpq.a $(shlib) postgres.h c.h
 
-libpq.a: $(OBJS)
+obj/libpq.a: $(OBJS)
 ifdef MK_NO_LORDER
-	$(AR) $(AROPT) libpq.a $(OBJS) 
+	$(AR) $(AROPT) obj/libpq.a $(OBJS) 
 else
-	$(AR) $(AROPT) libpq.a `lorder $(OBJS) | tsort`
+	$(AR) $(AROPT) obj/libpq.a `lorder $(OBJS) | tsort`
 endif
-	$(RANLIB) libpq.a
+	$(RANLIB) obj/libpq.a
 
 fe-lobj.o:: ../backend/fmgr.h
 
@@ -60,8 +61,8 @@ fe-lobj.o:: ../backend/fmgr.h
 ../backend/lib/dllist.o:
 	$(MAKE) -C ../backend/lib dllist.o
 
-libpq.so.1: $(OBJS)
-	$(CC) $(LDFLAGS) -shared $(OBJS) -o libpq.so.1
+obj/libpq.so.1: $(OBJS)
+	$(CC) $(LDFLAGS) -shared $(OBJS) -o obj/libpq.so.1
 
 postgres.h: ../include/postgres.h
 # Note: ../backend/include/postgres.h needs to be named something different
@@ -127,17 +128,17 @@ install-shlib-dep :=
 endif
 
 install-libpq:
-	$(INSTALL) $(INSTL_LIB_OPTS) libpq.a $(DESTDIR)$(LIBDIR)/libpq.a
+	$(INSTALL) $(INSTL_LIB_OPTS) obj/libpq.a $(DESTDIR)$(LIBDIR)/libpq.a
 
 install-shlib:
-	$(INSTALL) $(INSTL_LIB_OPTS) libpq.so.1 $(DESTDIR)$(LIBDIR)/libpq.so.1
+	$(INSTALL) $(INSTL_LIB_OPTS) obj/libpq.so.1 $(DESTDIR)$(LIBDIR)/libpq.so.1
 
 depend dep:
 	$(CC) -MM $(INCLUDE_OPT) *.c >depend
 
 .PHONY: clean
 clean:
-	rm -f libpq.a libpq.so.1 $(OBJS) c.h postgres.h
+	rm -f obj/libpq.a obj/libpq.so.1 $(OBJS) c.h postgres.h
 
 ifeq (depend,$(wildcard depend))
 include depend
diff --git a/src/interfaces/libpq/fe-lobj.c b/src/interfaces/libpq/fe-lobj.c
index e8cbf148ac4..b2c90331d27 100644
--- a/src/interfaces/libpq/fe-lobj.c
+++ b/src/interfaces/libpq/fe-lobj.c
@@ -7,10 +7,11 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-lobj.c,v 1.2 1996/10/31 05:58:32 momjian Exp $
+ *    $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-lobj.c,v 1.3 1996/11/08 06:02:28 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
+#include <unistd.h>
 #include <stdio.h>
 #include <fcntl.h>
 #include <sys/stat.h>
diff --git a/src/interfaces/libpq/pqsignal.c b/src/interfaces/libpq/pqsignal.c
index 638c494eda7..48868ef06a3 100644
--- a/src/interfaces/libpq/pqsignal.c
+++ b/src/interfaces/libpq/pqsignal.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/interfaces/libpq/pqsignal.c,v 1.1.1.1 1996/07/09 06:22:17 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/interfaces/libpq/pqsignal.c,v 1.2 1996/11/08 06:02:30 momjian Exp $
  *
  * NOTES
  *	This shouldn't be in libpq, but the monitor and some other
@@ -16,6 +16,8 @@
  *
  *-------------------------------------------------------------------------
  */
+#include <stdlib.h>
+
 #include "libpq/pqsignal.h"
 
 pqsigfunc