database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-06-25 01:02:05 +03:00
Code Activity

Reorganize code to allow path-relative installs.

Browse Source 
Create new get_* functions to access compiled-in paths and adjust if
relative installs are to be used.

Clean up substitute_libpath_macro() code.
This commit is contained in:
Bruce Momjian
2004-05-17 14:35:34 +00:00
parent 85383214ea
commit 3febb477e6
19 changed files with 374 additions and 170 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/timezone/Makefile
View File

@ -4,7 +4,7 @@
# Makefile for the timezone library
# IDENTIFICATION
# $PostgreSQL: pgsql/src/timezone/Makefile,v 1.7 2004/04/30 20:23:28 momjian Exp $
# $PostgreSQL: pgsql/src/timezone/Makefile,v 1.8 2004/05/17 14:35:34 momjian Exp $
#
#-------------------------------------------------------------------------
@ -12,8 +12,6 @@ subdir = src/timezone
top_builddir = ../..
include $(top_builddir)/src/Makefile.global
override CPPFLAGS += -DPGDATADIR=\"$(datadir)\"
OBJS= asctime.o difftime.o localtime.o pgtz.o
ZICOBJS= zic.o ialloc.o scheck.o localtime.o asctime.o pgtz.o

19
src/timezone/pgtz.c
View File

@ -6,7 +6,7 @@
* Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group
*
* IDENTIFICATION
* $PostgreSQL: pgsql/src/timezone/pgtz.c,v 1.7 2004/05/02 03:12:12 momjian Exp $
* $PostgreSQL: pgsql/src/timezone/pgtz.c,v 1.8 2004/05/17 14:35:34 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@ -25,22 +25,7 @@ pg_TZDIR(void)
if (done_tzdir)
return tzdir;
#ifndef WIN32
StrNCpy(tzdir, PGDATADIR, MAXPGPATH);
#else
if (GetModuleFileName(NULL, tzdir, MAXPGPATH) == 0)
return NULL;
#endif
canonicalize_path(tzdir);
#ifdef WIN32
/* trim off binary name, then go up a directory */
if ((p = last_path_separator(tzdir)) == NULL)
return NULL;
else
*p = '\0';
strcat(tzdir, "/../share");
#endif
get_share_dir(my_exec_path, tzdir);
strcat(tzdir, "/timezone");
done_tzdir = 1;