Use $(filter ...), not $(findstring ...).

petere · petere · commit 9cbcbf0fb366 · 2000-10-31T14:37:25.000Z
diff --git a/src/interfaces/libpgeasy/Makefile b/src/interfaces/libpgeasy/Makefile
@@ -2,7 +2,7 @@
 #
 # Makefile for src/interfaces/libpgeasy
 #
-# $Header: /cvsroot/pgsql/src/interfaces/libpgeasy/Attic/Makefile,v 1.4 2000/10/20 21:04:07 petere Exp $
+# $Header: /cvsroot/pgsql/src/interfaces/libpgeasy/Attic/Makefile,v 1.5 2000/10/31 14:37:25 petere Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -25,7 +25,7 @@ SHLIB_LINK+= $(libpq)
 # If crypt is a separate library, rather than part of libc, it may need
 # to be referenced separately to keep (broken) linkers happy.  (This is
 # braindead; users of libpq should not need to know what it depends on.)
-SHLIB_LINK+= $(findstring -lcrypt,$(LIBS))
+SHLIB_LINK+= $(filter -lcrypt, $(LIBS))
 
 all: all-lib
 
diff --git a/src/interfaces/libpgtcl/Makefile b/src/interfaces/libpgtcl/Makefile
@@ -4,7 +4,7 @@
 #
 # Copyright (c) 1994, Regents of the University of California
 #
-# $Header: /cvsroot/pgsql/src/interfaces/libpgtcl/Attic/Makefile,v 1.23 2000/10/20 21:04:10 petere Exp $
+# $Header: /cvsroot/pgsql/src/interfaces/libpgtcl/Attic/Makefile,v 1.24 2000/10/31 14:37:25 petere Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -25,7 +25,7 @@ SHLIB_LINK+= $(libpq)
 # If crypt is a separate library, rather than part of libc, it may need
 # to be referenced separately to keep (broken) linkers happy.  (This is
 # braindead; users of libpq should not need to know what it depends on.)
-SHLIB_LINK+= $(findstring -lcrypt,$(LIBS))
+SHLIB_LINK+= $(filter -lcrypt, $(LIBS))
 
 all: submake all-lib
 

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`#`
`3`	`3`	`# Makefile for src/interfaces/libpgeasy`
`4`	`4`	`#`
`5`		`-# $Header: /cvsroot/pgsql/src/interfaces/libpgeasy/Attic/Makefile,v 1.4 2000/10/20 21:04:07 petere Exp $`
	`5`	`+# $Header: /cvsroot/pgsql/src/interfaces/libpgeasy/Attic/Makefile,v 1.5 2000/10/31 14:37:25 petere Exp $`
`6`	`6`	`#`
`7`	`7`	`#-------------------------------------------------------------------------`
`8`	`8`
`@@ -25,7 +25,7 @@ SHLIB_LINK+= $(libpq)`
`25`	`25`	`# If crypt is a separate library, rather than part of libc, it may need`
`26`	`26`	`# to be referenced separately to keep (broken) linkers happy. (This is`
`27`	`27`	`# braindead; users of libpq should not need to know what it depends on.)`
`28`		`-SHLIB_LINK+= $(findstring -lcrypt,$(LIBS))`
	`28`	`+SHLIB_LINK+= $(filter -lcrypt, $(LIBS))`
`29`	`29`
`30`	`30`	`all: all-lib`
`31`	`31`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`#`
`5`	`5`	`# Copyright (c) 1994, Regents of the University of California`
`6`	`6`	`#`
`7`		`-# $Header: /cvsroot/pgsql/src/interfaces/libpgtcl/Attic/Makefile,v 1.23 2000/10/20 21:04:10 petere Exp $`
	`7`	`+# $Header: /cvsroot/pgsql/src/interfaces/libpgtcl/Attic/Makefile,v 1.24 2000/10/31 14:37:25 petere Exp $`
`8`	`8`	`#`
`9`	`9`	`#-------------------------------------------------------------------------`
`10`	`10`
`@@ -25,7 +25,7 @@ SHLIB_LINK+= $(libpq)`
`25`	`25`	`# If crypt is a separate library, rather than part of libc, it may need`
`26`	`26`	`# to be referenced separately to keep (broken) linkers happy. (This is`
`27`	`27`	`# braindead; users of libpq should not need to know what it depends on.)`
`28`		`-SHLIB_LINK+= $(findstring -lcrypt,$(LIBS))`
	`28`	`+SHLIB_LINK+= $(filter -lcrypt, $(LIBS))`
`29`	`29`
`30`	`30`	`all: submake all-lib`
`31`	`31`