@@ -29,15 +29,28 @@ endif
2929endif
3030
3131
32+ # On Windows, we don't link directly with the Tcl library; see below
3233ifneq ($(PORTNAME ) , win32)
33-
3434SHLIB_LINK =$(TCL_LIB_SPEC ) $(TCL_LIBS ) -lc
35+ endif
36+
37+
38+ NAME = pltcl
39+
40+ OBJS = pltcl.o
3541
36- else # win32
42+ DATA = pltcl.control pltcl--1.0.sql pltcl--unpackaged--1.0.sql\
43+ pltclu.control pltclu--1.0.sql pltclu--unpackaged--1.0.sql
44+
45+ REGRESS_OPTS = --dbname=$(PL_TESTDB ) --load-extension=pltcl
46+ REGRESS = pltcl_setup pltcl_queries
47+ # where to find psql for running the tests
48+ PSQLDIR =$(bindir )
3749
3850# Tcl on win32 ships with import libraries only for Microsoft Visual C++,
3951# which are not compatible with mingw gcc. Therefore we need to build a
4052# new import library to link with.
53+ ifeq ($(PORTNAME ) , win32)
4154
4255tclwithver =$(subst -l,,$(filter -l% ,$(TCL_LIB_SPEC ) ) )
4356TCLDLL =$(subst -L,,$(filter -L% ,$(TCL_LIB_SPEC ) ) ) /$(tclwithver ) .dll
@@ -53,18 +66,6 @@ $(tclwithver).def: $(TCLDLL)
5366endif # win32
5467
5568
56- NAME = pltcl
57-
58- OBJS = pltcl.o
59-
60- DATA = pltcl.control pltcl--1.0.sql pltcl--unpackaged--1.0.sql\
61- pltclu.control pltclu--1.0.sql pltclu--unpackaged--1.0.sql
62-
63- REGRESS_OPTS = --dbname=$(PL_TESTDB ) --load-extension=pltcl
64- REGRESS = pltcl_setup pltcl_queries
65- # where to find psql for running the tests
66- PSQLDIR =$(bindir )
67-
6869include $(top_srcdir ) /src/Makefile.shlib
6970
7071ifeq ($(TCL_SHARED_BUILD ) , 1)