|
1 | 1 | # -*-makefile-*- |
2 | | -# $PostgreSQL: pgsql/src/Makefile.global.in,v 1.217 2005/07/06 21:04:14 momjian Exp $ |
| 2 | +# $PostgreSQL: pgsql/src/Makefile.global.in,v 1.218 2005/07/28 03:15:52 tgl Exp $ |
3 | 3 |
|
4 | 4 | #------------------------------------------------------------------------------ |
5 | 5 | # All PostgreSQL makefiles include this file and use the variables it sets, |
@@ -153,10 +153,6 @@ TCL_INCLUDE_SPEC= @TCL_INCLUDE_SPEC@ |
153 | 153 | TCL_SHARED_BUILD= @TCL_SHARED_BUILD@ |
154 | 154 | TCL_SHLIB_LD_LIBS= @TCL_SHLIB_LD_LIBS@ |
155 | 155 |
|
156 | | -TK_LIBS= @TK_LIBS@ |
157 | | -TK_LIB_SPEC= @TK_LIB_SPEC@ |
158 | | -TK_XINCLUDES= @TK_XINCLUDES@ |
159 | | - |
160 | 156 | PTHREAD_CFLAGS= @PTHREAD_CFLAGS@ |
161 | 157 | PTHREAD_LIBS= @PTHREAD_LIBS@ |
162 | 158 |
|
@@ -392,14 +388,14 @@ endif |
392 | 388 |
|
393 | 389 | ########################################################################## |
394 | 390 | # |
395 | | -# substitute implementations oftheC library |
| 391 | +# substitute implementations of C library routines |
396 | 392 |
|
397 | 393 | LIBOBJS = @LIBOBJS@ dirmod.o exec.o noblock.o path.o pipe.o pgsleep.o pgstrcasecmp.o sprompt.o thread.o |
398 | 394 |
|
399 | 395 | ifneq (,$(LIBOBJS)) |
400 | 396 | LIBS := -lpgport$(LIBS) |
| 397 | +# add location of libpgport.a to LDFLAGS |
401 | 398 | ifdefPGXS |
402 | | -# where libpgport.a is installed |
403 | 399 | overrideLDFLAGS := -L$(libdir)$(LDFLAGS) |
404 | 400 | else |
405 | 401 | overrideLDFLAGS := -L$(top_builddir)/src/port$(LDFLAGS) |
|