Here's two more diffs...

The first fixes a warning from gcc about the assignment within the condition.
The extra set of parens should not make a difference, but with -Werror, they
are necessary.

The second fixes an "ln -s" invocation that assumes the current directory is
implicitly the target if not specified.  Not true in all cases, and again, it
should not make a difference except to those implementation that it does.

From: "Michael P. Snyder" <msnyder@hawkeye.huntersmoon.com>

diff --git a/src/interfaces/libpq/Makefile b/src/interfaces/libpq/Makefile
index 31885c27bd522616745ee0fd1498cde3f2f8708e..973249647d5347819f680b8f6cddb5c2587caf86 100644 (file)
--- a/src/interfaces/libpq/Makefile
+++ b/src/interfaces/libpq/Makefile
@@ -7,7 +7,7 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/interfaces/libpq/Makefile,v 1.31 1997/03/17 22:05:05 scrappy Exp $
+#    $Header: /cvsroot/pgsql/src/interfaces/libpq/Makefile,v 1.32 1997/03/25 09:08:05 scrappy Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -58,10 +58,10 @@ fe-lobj.o: ../backend/fmgr.h
 # We need to compile this with special options for shared libs,
 # so we can't use the object in ../backend
 dllist.c:      ../backend/lib/dllist.c
-       -ln -s ../backend/lib/dllist.c
+       -ln -s ../backend/lib/dllist.c .
 
 pqcomprim.c:       ../backend/libpq/pqcomprim.c
-       -ln -s ../backend/libpq/pqcomprim.c
+       -ln -s ../backend/libpq/pqcomprim.c .
 
 # The following rules cause dependencies in the backend directory to 
 # get made if they don't exist, but don't cause them to get remade if they

diff --git a/src/interfaces/libpq/fe-connect.c b/src/interfaces/libpq/fe-connect.c
index b5ac17f5cfacef8b4b7f8c7d131217f0a93a7bb0..979fe8559bcc62cd63623a4e30440ac2fdaca962 100644 (file)
--- a/src/interfaces/libpq/fe-connect.c
+++ b/src/interfaces/libpq/fe-connect.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-connect.c,v 1.26 1997/03/25 02:37:21 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-connect.c,v 1.27 1997/03/25 09:08:06 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -536,7 +536,7 @@ connectDB(PGconn *conn)
                        {
                        const char *val;
                        
-                       if(val = getenv(eo->envName))
+                       if((val = getenv(eo->envName)))
                                {
                                PGresult *res;