diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2005-01-26 19:24:03 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2005-01-26 19:24:03 +0000 |
| commit | 889f03812916b146ae504c0fad5afdc7bf2e8a2a (patch) | |
| tree | a853f23a7f10873ea8de8df85b839cf963341cbd /src/Makefile.global.in | |
| parent | c0e0d3e2e924b41a42db3c3cd8329421b06436e3 (diff) | |
| download | postgresql-889f03812916b146ae504c0fad5afdc7bf2e8a2a.tar.gz | |
Use SHGetFolderPath instead of SHGetSpecialFolderPath to find the
APPDATA directory on Windows. Magnus Hagander
Diffstat (limited to 'src/Makefile.global.in')
| -rw-r--r-- | src/Makefile.global.in | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/Makefile.global.in b/src/Makefile.global.in index 1dd5aa03a7..e2814752e7 100644 --- a/src/Makefile.global.in +++ b/src/Makefile.global.in @@ -1,5 +1,5 @@ # -*-makefile-*- -# $PostgreSQL: pgsql/src/Makefile.global.in,v 1.208 2004/12/19 02:16:18 momjian Exp $ +# $PostgreSQL: pgsql/src/Makefile.global.in,v 1.209 2005/01/26 19:23:59 tgl Exp $ #------------------------------------------------------------------------------ # All PostgreSQL makefiles include this file and use the variables it sets, @@ -384,9 +384,10 @@ override LDFLAGS := -L$(top_builddir)/src/port $(LDFLAGS) endif endif -# to make ws2_32.lib the last library +# to make ws2_32.lib the last library, and always link with shfolder, +# so SHGetFolderName isn't picked up from shell32.dll ifeq ($(PORTNAME),win32) -LIBS += -lws2_32 +LIBS += -lws2_32 -lshfolder endif # Not really standard libc functions, used by the backend. |