Commitc86ce06

committed

DLL_DEFFILE should be defined when PORTNAME is win32, not when it isn't,

per the example of libpq/Makefile.

1 parent746593e commitc86ce06Copy full SHA for c86ce06

File tree

-6

lines changed

-6

lines changed

Lines changed: 2 additions & 2 deletions

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`		`-# $PostgreSQL: pgsql/src/interfaces/ecpg/compatlib/Makefile,v 1.34 2007/10/0407:58:15 meskes Exp $`
	`7`	`+# $PostgreSQL: pgsql/src/interfaces/ecpg/compatlib/Makefile,v 1.35 2007/10/0418:32:07 tgl Exp $`
`8`	`8`	`#`
`9`	`9`	`#-------------------------------------------------------------------------`
`10`	`10`
`@@ -29,7 +29,7 @@ LIBS := $(filter-out -lpgport, $(LIBS))`
`29`	`29`
`30`	`30`	`OBJS= informix.o$(filter snprintf.o,$(LIBOBJS))`
`31`	`31`
`32`		`-ifneq ($(PORTNAME), win32)`
	`32`	`+ifeq ($(PORTNAME), win32)`
`33`	`33`	`DLL_DEFFILE=libecpg_compatdll.def`
`34`	`34`	`endif`
`35`	`35`

Lines changed: 2 additions & 2 deletions

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`		`-# $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/Makefile,v 1.50 2007/10/0407:58:15 meskes Exp $`
	`7`	`+# $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/Makefile,v 1.51 2007/10/0418:32:07 tgl Exp $`
`8`	`8`	`#`
`9`	`9`	`#-------------------------------------------------------------------------`
`10`	`10`
`@@ -31,14 +31,14 @@ OBJS= execute.o typename.o descriptor.o data.o error.o prepare.o memory.o \`
`31`	`31`	`# thread.c is needed only for non-WIN32 implementation of path.c`
`32`	`32`	`ifneq ($(PORTNAME), win32)`
`33`	`33`	`OBJS += thread.o`
`34`		`-DLL_DEFFILE=libecpgdll.def`
`35`	`34`	`endif`
`36`	`35`
`37`	`36`	`SHLIB_LINK = -L../pgtypeslib -lpgtypes$(libpq) -lm$(PTHREAD_LIBS)`
`38`	`37`
`39`	`38`	`ifeq ($(PORTNAME), win32)`
`40`	`39`	`# Link to shfolder.dll instead of shell32.dll`
`41`	`40`	`SHLIB_LINK += -lshfolder`
	`41`	`+DLL_DEFFILE=libecpgdll.def`
`42`	`42`	`endif`
`43`	`43`
`44`	`44`	`all: def-files all-lib`

Lines changed: 2 additions & 2 deletions

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`		`-# $PostgreSQL: pgsql/src/interfaces/ecpg/pgtypeslib/Makefile,v 1.36 2007/10/0407:58:15 meskes Exp $`
	`7`	`+# $PostgreSQL: pgsql/src/interfaces/ecpg/pgtypeslib/Makefile,v 1.37 2007/10/0418:32:07 tgl Exp $`
`8`	`8`	`#`
`9`	`9`	`#-------------------------------------------------------------------------`
`10`	`10`
`@@ -30,7 +30,7 @@ OBJS= numeric.o datetime.o common.o dt_common.o timestamp.o interval.o \`
`30`	`30`	`pgstrcasecmp.o\`
`31`	`31`	`$(filter rint.o snprintf.o,$(LIBOBJS))`
`32`	`32`
`33`		`-ifneq ($(PORTNAME), win32)`
	`33`	`+ifeq ($(PORTNAME), win32)`
`34`	`34`	`DLL_DEFFILE=libpgtypesdll.def`
`35`	`35`	`endif`
`36`	`36`

Comments

(0)