quick fix to src/bin/Makefile.global so that compiling doesn't look for a

scrappy · scrappy · commit 435d32cd2555 · 1996-07-22T04:51:05.000Z
libpq that is already installed...

submitted by: Bruce Momjian (root@candle.pha.pa.us)
diff --git a/src/bin/Makefile.global b/src/bin/Makefile.global
@@ -7,18 +7,16 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/bin/Attic/Makefile.global,v 1.3 1996/07/19 06:47:51 scrappy Exp $
+#    $Header: /cvsroot/pgsql/src/bin/Attic/Makefile.global,v 1.4 1996/07/22 04:51:05 scrappy Exp $
 #
 #-------------------------------------------------------------------------
 
 CFLAGS+= -I$(srcdir)/backend -I$(srcdir)/backend/include -I$(srcdir)/libpq 
 
 #
-# try locating libpq.a in the following places
-# Almost all (all?) the C programs in this directory
 # link with libpq, so we put it here.
 #
-LIBPQ:=   -L$(srcdir)/libpq/$(objdir) -L$(LIBDIR) -lpq
+LIBPQ:=   -L$(srcdir)/libpq/$(objdir) -lpq
 
 LD_ADD+= $(LIBPQ)
 DPADD+= $(LIBPQ)

Original file line number	Diff line number	Diff line change
`@@ -7,18 +7,16 @@`
`7`	`7`	`#`
`8`	`8`	`#`
`9`	`9`	`# IDENTIFICATION`
`10`		`-# $Header: /cvsroot/pgsql/src/bin/Attic/Makefile.global,v 1.3 1996/07/19 06:47:51 scrappy Exp $`
	`10`	`+# $Header: /cvsroot/pgsql/src/bin/Attic/Makefile.global,v 1.4 1996/07/22 04:51:05 scrappy Exp $`
`11`	`11`	`#`
`12`	`12`	`#-------------------------------------------------------------------------`
`13`	`13`
`14`	`14`	`CFLAGS+= -I$(srcdir)/backend -I$(srcdir)/backend/include -I$(srcdir)/libpq`
`15`	`15`
`16`	`16`	`#`
`17`		`-# try locating libpq.a in the following places`
`18`		`-# Almost all (all?) the C programs in this directory`
`19`	`17`	`# link with libpq, so we put it here.`
`20`	`18`	`#`
`21`		`-LIBPQ:= -L$(srcdir)/libpq/$(objdir) -L$(LIBDIR) -lpq`
	`19`	`+LIBPQ:= -L$(srcdir)/libpq/$(objdir) -lpq`
`22`	`20`
`23`	`21`	`LD_ADD+= $(LIBPQ)`
`24`	`22`	`DPADD+= $(LIBPQ)`