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

per the example of libpq/Makefile.

diff --git a/src/interfaces/ecpg/compatlib/Makefile b/src/interfaces/ecpg/compatlib/Makefile
index 8223152e8472aae8358165ffe030275a039a6184..47b2eabc22f8ea463602b63f98b05e154bdd2da8 100644 (file)
--- a/src/interfaces/ecpg/compatlib/Makefile
+++ b/src/interfaces/ecpg/compatlib/Makefile
@@ -4,7 +4,7 @@
 #
 # Copyright (c) 1994, Regents of the University of California
 #
-# $PostgreSQL: pgsql/src/interfaces/ecpg/compatlib/Makefile,v 1.34 2007/10/04 07:58:15 meskes Exp $
+# $PostgreSQL: pgsql/src/interfaces/ecpg/compatlib/Makefile,v 1.35 2007/10/04 18:32:07 tgl Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -29,7 +29,7 @@ LIBS := $(filter-out -lpgport, $(LIBS))
 
 OBJS= informix.o $(filter snprintf.o, $(LIBOBJS))
 
-ifneq ($(PORTNAME), win32)
+ifeq ($(PORTNAME), win32)
 DLL_DEFFILE=libecpg_compatdll.def
 endif
 

diff --git a/src/interfaces/ecpg/ecpglib/Makefile b/src/interfaces/ecpg/ecpglib/Makefile
index b55f6ed2125dc0d23669e488be438bcee97d4ad1..087f656dd3c2e5e1e343e3ece860e566c146c383 100644 (file)
--- a/src/interfaces/ecpg/ecpglib/Makefile
+++ b/src/interfaces/ecpg/ecpglib/Makefile
@@ -4,7 +4,7 @@
 #
 # Copyright (c) 1994, Regents of the University of California
 #
-# $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/Makefile,v 1.50 2007/10/04 07:58:15 meskes Exp $
+# $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/Makefile,v 1.51 2007/10/04 18:32:07 tgl Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -31,7 +31,6 @@ OBJS= execute.o typename.o descriptor.o data.o error.o prepare.o memory.o \
 # thread.c is needed only for non-WIN32 implementation of path.c
 ifneq ($(PORTNAME), win32)
 OBJS += thread.o
-DLL_DEFFILE=libecpgdll.def
 endif
 
 SHLIB_LINK = -L../pgtypeslib -lpgtypes $(libpq) -lm $(PTHREAD_LIBS)
@@ -39,6 +38,7 @@ SHLIB_LINK = -L../pgtypeslib -lpgtypes $(libpq) -lm $(PTHREAD_LIBS)
 ifeq ($(PORTNAME), win32)
 # Link to shfolder.dll instead of shell32.dll
 SHLIB_LINK += -lshfolder
+DLL_DEFFILE=libecpgdll.def
 endif
 
 all: def-files all-lib

diff --git a/src/interfaces/ecpg/pgtypeslib/Makefile b/src/interfaces/ecpg/pgtypeslib/Makefile
index 0c51d219f82d5219b06f6f50004f31d1da64bb39..6008dd1215e69b590158bb8694bac35abe827151 100644 (file)
--- a/src/interfaces/ecpg/pgtypeslib/Makefile
+++ b/src/interfaces/ecpg/pgtypeslib/Makefile
@@ -4,7 +4,7 @@
 #
 # Copyright (c) 1994, Regents of the University of California
 #
-# $PostgreSQL: pgsql/src/interfaces/ecpg/pgtypeslib/Makefile,v 1.36 2007/10/04 07:58:15 meskes Exp $
+# $PostgreSQL: pgsql/src/interfaces/ecpg/pgtypeslib/Makefile,v 1.37 2007/10/04 18:32:07 tgl Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -30,7 +30,7 @@ OBJS= numeric.o datetime.o common.o dt_common.o timestamp.o interval.o \
        pgstrcasecmp.o \
        $(filter rint.o snprintf.o, $(LIBOBJS))
 
-ifneq ($(PORTNAME), win32)
+ifeq ($(PORTNAME), win32)
 DLL_DEFFILE=libpgtypesdll.def
 endif