mirror/postgresql
2
0
Fork 0
mirror of https://git.postgresql.org/git/postgresql.git synced 2025-03-13 19:57:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

Determines the PKGLIBDIR equivalent under win32. Requires pgsql lib and

Browse Source 
bin directories to be packaged under the same root directory (eg. <some
path>/pgsql/bin and <some path>/pgsql/lib) for the win32 port, which
does not appear to be an onerous restriction.

Claudio Natoli
This commit is contained in:
Bruce Momjian 2004-03-09 05:06:45 +00:00
parent 943eae92fb
commit eeec31774a
1 changed files with 23 additions and 1 deletions

24
src/backend/utils/fmgr/dfmgr.c

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/utils/fmgr/dfmgr.c,v 1.70 2004/02/17 03:35:57 momjian Exp $ * $PostgreSQL: pgsql/src/backend/utils/fmgr/dfmgr.c,v 1.71 2004/03/09 05:06:45 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -343,6 +343,9 @@ substitute_libpath_macro(const char *name)
{ {
size_t macroname_len; size_t macroname_len;
char *replacement = NULL; char *replacement = NULL;
#ifdef WIN32
char basename[MAXPGPATH];
#endif
AssertArg(name != NULL); AssertArg(name != NULL);
@ -356,7 +359,26 @@ substitute_libpath_macro(const char *name)
#endif #endif
if (strncmp(name, "$libdir", macroname_len) == 0) if (strncmp(name, "$libdir", macroname_len) == 0)
#ifndef WIN32
replacement = PKGLIBDIR; replacement = PKGLIBDIR;
#else
{
char *p;
if (GetModuleFileName(NULL,basename,MAXPGPATH) == 0)
ereport(FATAL,
(errmsg("GetModuleFileName failed (%i)",(int)GetLastError())));
canonicalize_path(basename);
if ((p = last_path_separator(basename)) == NULL)
ereport(FATAL,
(errmsg("unexpected failure in determining PKGLIBDIR (%s)",basename)));
else
*p = '\0';
strcat(basename,"/../lib");
replacement = basename;
}
#endif
else else
ereport(ERROR, ereport(ERROR,
(errcode(ERRCODE_INVALID_NAME), (errcode(ERRCODE_INVALID_NAME),