c8h4/postgresql
1
0
Fork 0
Code Issues Pull requests Actions 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
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -8,7 +8,7 @@
*
*
* 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;
char *replacement = NULL;
#ifdef WIN32
char basename[MAXPGPATH];
#endif
AssertArg(name != NULL);
@ -356,7 +359,26 @@ substitute_libpath_macro(const char *name)
#endif
if (strncmp(name, "$libdir", macroname_len) == 0)
#ifndef WIN32
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
ereport(ERROR,
(errcode(ERRCODE_INVALID_NAME),