Commit962e825

committed

Put back libpq link, but make sure that libpq's in-tree directory is

mentioned before the system directories.

1 parent066926d commit962e825Copy full SHA for 962e825

File tree

-2

lines changed

-2

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -2,8 +2,8 @@ override CPPFLAGS := -I../../include -I$(top_srcdir)/src/interfaces/ecpg/include`
`2`	`2`	`-I$(libpq_srcdir) $(CPPFLAGS)`
`3`	`3`	`override CFLAGS += $(PTHREAD_CFLAGS)`
`4`	`4`
`5`		`-override LDFLAGS := -L../../ecpglib -L../../pgtypeslib $(LDFLAGS)`
`6`		`-override LIBS := -lecpg -lpgtypes $(LIBS) $(PTHREAD_LIBS)`
	`5`	`+override LDFLAGS := -L../../ecpglib -L../../pgtypeslib $(filter-out -l%, $(libpq)) $(LDFLAGS)`
	`6`	`+override LIBS := -lecpg -lpgtypes $(filter -l%, $(libpq)) $(LIBS) $(PTHREAD_LIBS)`
`7`	`7`
`8`	`8`	`ECPG = ../../preproc/ecpg --regression -I$(srcdir)/../../include`
`9`	`9`

Comments

(0)