Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit4fc935a

Browse files
committed
Fix problems with PGXS builds against an installation tree that was
relocated after installation. We can't trust the installation pathsinserted into Makefile.global by configure, so instead we must get thepaths from pg_config. This requires extending pg_config to support allthe separately-configurable path names, but that was on TODO anyway.
1 parent2d8225e commit4fc935a

File tree

9 files changed

+203
-19
lines changed

9 files changed

+203
-19
lines changed

‎doc/src/sgml/ref/pg_config-ref.sgml

Lines changed: 60 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!-- $PostgreSQL: pgsql/doc/src/sgml/ref/pg_config-ref.sgml,v 1.21 2005/08/09 22:47:03 tgl Exp $ -->
1+
<!-- $PostgreSQL: pgsql/doc/src/sgml/ref/pg_config-ref.sgml,v 1.22 2005/09/27 17:39:32 tgl Exp $ -->
22

33
<refentry id="app-pgconfig">
44
<refmeta>
@@ -53,6 +53,17 @@
5353
</listitem>
5454
</varlistentry>
5555

56+
<varlistentry>
57+
<term><option>--docdir</option></>
58+
<listitem>
59+
<para>
60+
Print the location of documentation files. (This will be an empty
61+
string if <literal>--without-docdir</> was specified when
62+
<productname>PostgreSQL</> was built.)
63+
</para>
64+
</listitem>
65+
</varlistentry>
66+
5667
<varlistentry>
5768
<term><option>--includedir</option></>
5869
<listitem>
@@ -62,12 +73,20 @@
6273
</listitem>
6374
</varlistentry>
6475

76+
<varlistentry>
77+
<term><option>--pkgincludedir</option></>
78+
<listitem>
79+
<para>
80+
Print the location of other C header files.
81+
</para>
82+
</listitem>
83+
</varlistentry>
84+
6585
<varlistentry>
6686
<term><option>--includedir-server</option></>
6787
<listitem>
6888
<para>
69-
Print the location of C header files for server
70-
programming.
89+
Print the location of C header files for server programming.
7190
</para>
7291
</listitem>
7392
</varlistentry>
@@ -93,6 +112,44 @@
93112
</listitem>
94113
</varlistentry>
95114

115+
<varlistentry>
116+
<term><option>--localedir</option></>
117+
<listitem>
118+
<para>
119+
Print the location of locale support files. (This will be an empty
120+
string if locale support was not configured when
121+
<productname>PostgreSQL</> was built.)
122+
</para>
123+
</listitem>
124+
</varlistentry>
125+
126+
<varlistentry>
127+
<term><option>--mandir</option></>
128+
<listitem>
129+
<para>
130+
Print the location of manual pages.
131+
</para>
132+
</listitem>
133+
</varlistentry>
134+
135+
<varlistentry>
136+
<term><option>--sharedir</option></>
137+
<listitem>
138+
<para>
139+
Print the location of architecture-independent support files.
140+
</para>
141+
</listitem>
142+
</varlistentry>
143+
144+
<varlistentry>
145+
<term><option>--sysconfdir</option></>
146+
<listitem>
147+
<para>
148+
Print the location of system-wide configuration files.
149+
</para>
150+
</listitem>
151+
</varlistentry>
152+
96153
<varlistentry>
97154
<term><option>--pgxs</option></>
98155
<listitem>

‎src/Makefile.global.in

Lines changed: 33 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# -*-makefile-*-
2-
# $PostgreSQL: pgsql/src/Makefile.global.in,v 1.219 2005/08/02 19:02:31 tgl Exp $
2+
# $PostgreSQL: pgsql/src/Makefile.global.in,v 1.220 2005/09/27 17:39:32 tgl Exp $
33

44
#------------------------------------------------------------------------------
55
# All PostgreSQL makefiles include this file and use the variables it sets,
@@ -55,19 +55,20 @@ configure_args = @configure_args@
5555
# These are set by the equivalent --xxxdir configure options. We
5656
# append "postgresql" to some of them, if the string does not already
5757
# contain "pgsql" or "postgres", in order to avoid directory clutter.
58+
#
59+
# In a PGXS build, we cannot use the values inserted into Makefile.global
60+
# by configure, since the installation tree may have been relocated.
61+
# Instead get the path values from pg_config.
62+
63+
ifndefPGXS
64+
65+
# Note that prefix and exec_prefix aren't defined in a PGXS build;
66+
# makefiles may only use the derived variables such as bindir.
5867

5968
prefix := @prefix@
6069
exec_prefix := @exec_prefix@
6170

6271
bindir := @bindir@
63-
sbindir := @sbindir@
64-
65-
libexecdir := @libexecdir@
66-
ifeq "$(findstring pgsql,$(libexecdir))" ""
67-
ifeq "$(findstring postgres,$(libexecdir))" ""
68-
overridelibexecdir :=$(libexecdir)/postgresql
69-
endif
70-
endif
7172

7273
datadir := @datadir@
7374
ifeq "$(findstring pgsql,$(datadir))" ""
@@ -84,6 +85,7 @@ endif
8485
endif
8586

8687
libdir := @libdir@
88+
8789
pkglibdir =$(libdir)
8890
ifeq "$(findstring pgsql,$(pkglibdir))" ""
8991
ifeq "$(findstring postgres,$(pkglibdir))" ""
@@ -92,17 +94,15 @@ endif
9294
endif
9395

9496
includedir := @includedir@
97+
9598
pkgincludedir =$(includedir)
9699
ifeq "$(findstring pgsql,$(pkgincludedir))" ""
97100
ifeq "$(findstring postgres,$(pkgincludedir))" ""
98101
overridepkgincludedir :=$(pkgincludedir)/postgresql
99102
endif
100103
endif
101-
includedir_server =$(pkgincludedir)/server
102-
includedir_internal =$(pkgincludedir)/internal
103104

104105
mandir := @mandir@
105-
sqlmansect_dummy = l
106106

107107
docdir := @docdir@
108108
# docdir can be an empty string to signify --without-docdir
@@ -116,8 +116,29 @@ endif
116116

117117
localedir := @localedir@
118118

119+
else# PGXS case
120+
121+
bindir :=$(shell pg_config --bindir)
122+
datadir :=$(shell pg_config --sharedir)
123+
sysconfdir :=$(shell pg_config --sysconfdir)
124+
libdir :=$(shell pg_config --libdir)
125+
pkglibdir :=$(shell pg_config --pkglibdir)
126+
includedir :=$(shell pg_config --includedir)
127+
pkgincludedir :=$(shell pg_config --pkgincludedir)
128+
mandir :=$(shell pg_config --mandir)
129+
docdir :=$(shell pg_config --docdir)
130+
localedir :=$(shell pg_config --localedir)
131+
132+
endif# PGXS
133+
134+
# These derived path variables aren't separately configurable.
135+
136+
includedir_server =$(pkgincludedir)/server
137+
includedir_internal =$(pkgincludedir)/internal
119138
pgxsdir =$(pkglibdir)/pgxs
120139

140+
sqlmansect_dummy = l
141+
121142

122143
##########################################################################
123144
#

‎src/bin/pg_config/pg_config.c

Lines changed: 79 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
*
1818
* Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group
1919
*
20-
* $PostgreSQL: pgsql/src/bin/pg_config/pg_config.c,v 1.12 2005/08/09 22:47:03 tgl Exp $
20+
* $PostgreSQL: pgsql/src/bin/pg_config/pg_config.c,v 1.13 2005/09/27 17:39:33 tgl Exp $
2121
*
2222
*-------------------------------------------------------------------------
2323
*/
@@ -52,6 +52,17 @@ show_bindir(bool all)
5252
printf("%s\n",path);
5353
}
5454

55+
staticvoid
56+
show_docdir(boolall)
57+
{
58+
charpath[MAXPGPATH];
59+
60+
if (all)
61+
printf("DOCDIR = ");
62+
get_doc_path(mypath,path);
63+
printf("%s\n",path);
64+
}
65+
5566
staticvoid
5667
show_includedir(boolall)
5768
{
@@ -63,6 +74,17 @@ show_includedir(bool all)
6374
printf("%s\n",path);
6475
}
6576

77+
staticvoid
78+
show_pkgincludedir(boolall)
79+
{
80+
charpath[MAXPGPATH];
81+
82+
if (all)
83+
printf("PKGINCLUDEDIR = ");
84+
get_pkginclude_path(mypath,path);
85+
printf("%s\n",path);
86+
}
87+
6688
staticvoid
6789
show_includedir_server(boolall)
6890
{
@@ -96,6 +118,50 @@ show_pkglibdir(bool all)
96118
printf("%s\n",path);
97119
}
98120

121+
staticvoid
122+
show_localedir(boolall)
123+
{
124+
charpath[MAXPGPATH];
125+
126+
if (all)
127+
printf("LOCALEDIR = ");
128+
get_locale_path(mypath,path);
129+
printf("%s\n",path);
130+
}
131+
132+
staticvoid
133+
show_mandir(boolall)
134+
{
135+
charpath[MAXPGPATH];
136+
137+
if (all)
138+
printf("MANDIR = ");
139+
get_man_path(mypath,path);
140+
printf("%s\n",path);
141+
}
142+
143+
staticvoid
144+
show_sharedir(boolall)
145+
{
146+
charpath[MAXPGPATH];
147+
148+
if (all)
149+
printf("SHAREDIR = ");
150+
get_share_path(mypath,path);
151+
printf("%s\n",path);
152+
}
153+
154+
staticvoid
155+
show_sysconfdir(boolall)
156+
{
157+
charpath[MAXPGPATH];
158+
159+
if (all)
160+
printf("SYSCONFDIR = ");
161+
get_etc_path(mypath,path);
162+
printf("%s\n",path);
163+
}
164+
99165
staticvoid
100166
show_pgxs(boolall)
101167
{
@@ -234,10 +300,16 @@ typedef struct
234300

235301
staticconstInfoIteminfo_items[]= {
236302
{"--bindir",show_bindir },
303+
{"--docdir",show_docdir },
237304
{"--includedir",show_includedir },
305+
{"--pkgincludedir",show_pkgincludedir },
238306
{"--includedir-server",show_includedir_server },
239307
{"--libdir",show_libdir },
240308
{"--pkglibdir",show_pkglibdir },
309+
{"--localedir",show_localedir },
310+
{"--mandir",show_mandir },
311+
{"--sharedir",show_sharedir },
312+
{"--sysconfdir",show_sysconfdir },
241313
{"--pgxs",show_pgxs },
242314
{"--configure",show_configure },
243315
{"--cc",show_cc },
@@ -260,11 +332,17 @@ help(void)
260332
printf(_(" %s [ OPTION ... ]\n\n"),progname);
261333
printf(_("Options:\n"));
262334
printf(_(" --bindir show location of user executables\n"));
335+
printf(_(" --docdir show location of documentation files\n"));
263336
printf(_(" --includedir show location of C header files of the client\n"
264337
" interfaces\n"));
338+
printf(_(" --pkgincludedir show location of other C header files\n"));
265339
printf(_(" --includedir-server show location of C header files for the server\n"));
266340
printf(_(" --libdir show location of object code libraries\n"));
267341
printf(_(" --pkglibdir show location of dynamically loadable modules\n"));
342+
printf(_(" --localedir show location of locale support files\n"));
343+
printf(_(" --mandir show location of manual pages\n"));
344+
printf(_(" --sharedir show location of architecture-independent support files\n"));
345+
printf(_(" --sysconfdir show location of system-wide configuration files\n"));
268346
printf(_(" --pgxs show location of extension makefile\n"));
269347
printf(_(" --configure show options given to \"configure\" script when\n"
270348
" PostgreSQL was built\n"));

‎src/bin/pg_config/win32.mak

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,8 @@ CLEAN :
3939
echo#define LIBDIR "" >>$@
4040
echo#define PKGLIBDIR "" >>$@
4141
echo#define LOCALEDIR "" >>$@
42+
echo#define DOCDIR "" >>$@
43+
echo#define MANDIR "" >>$@
4244

4345
"$(OUTDIR)" :
4446
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"

‎src/bin/psql/bcc32.mak

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -159,6 +159,8 @@ LINK32_OBJS= $(LINK32_OBJS) "..\..\interfaces\libpq\Release\blibpqdll.lib"
159159
echo\#define LIBDIR"">>$@
160160
echo\#define PKGLIBDIR"">>$@
161161
echo\#define LOCALEDIR"">>$@
162+
echo\#define DOCDIR"">>$@
163+
echo\#define MANDIR"">>$@
162164

163165
"$(OUTDIR)" :
164166
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"

‎src/bin/psql/win32.mak

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,8 @@ LINK32_OBJS= $(LINK32_OBJS) "..\..\interfaces\libpq\Release\libpqdll.lib"
108108
echo#define LIBDIR "" >>$@
109109
echo#define PKGLIBDIR "" >>$@
110110
echo#define LOCALEDIR "" >>$@
111+
echo#define DOCDIR "" >>$@
112+
echo#define MANDIR "" >>$@
111113

112114
"$(OUTDIR)" :
113115
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"

‎src/include/port.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group
77
* Portions Copyright (c) 1994, Regents of the University of California
88
*
9-
* $PostgreSQL: pgsql/src/include/port.h,v 1.82 2005/08/29 19:39:39 tgl Exp $
9+
* $PostgreSQL: pgsql/src/include/port.h,v 1.83 2005/09/27 17:39:34 tgl Exp $
1010
*
1111
*-------------------------------------------------------------------------
1212
*/
@@ -43,6 +43,8 @@ extern void get_includeserver_path(const char *my_exec_path, char *ret_path);
4343
externvoidget_lib_path(constchar*my_exec_path,char*ret_path);
4444
externvoidget_pkglib_path(constchar*my_exec_path,char*ret_path);
4545
externvoidget_locale_path(constchar*my_exec_path,char*ret_path);
46+
externvoidget_doc_path(constchar*my_exec_path,char*ret_path);
47+
externvoidget_man_path(constchar*my_exec_path,char*ret_path);
4648
externvoidset_pglocale_pgservice(constchar*argv0,constchar*app);
4749
externboolget_home_path(char*ret_path);
4850
externvoidget_parent_directory(char*path);

‎src/port/Makefile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
#for use only by the backend binaries
1616
#
1717
# IDENTIFICATION
18-
# $PostgreSQL: pgsql/src/port/Makefile,v 1.28 2005/08/12 19:45:14 momjian Exp $
18+
# $PostgreSQL: pgsql/src/port/Makefile,v 1.29 2005/09/27 17:39:35 tgl Exp $
1919
#
2020
#-------------------------------------------------------------------------
2121

@@ -81,6 +81,8 @@ pg_config_paths.h: $(top_builddir)/src/Makefile.global
8181
echo"#define LIBDIR\"$(libdir)\"">>$@
8282
echo"#define PKGLIBDIR\"$(pkglibdir)\"">>$@
8383
echo"#define LOCALEDIR\"$(localedir)\"">>$@
84+
echo"#define DOCDIR\"$(docdir)\"">>$@
85+
echo"#define MANDIR\"$(mandir)\"">>$@
8486

8587
cleandistcleanmaintainer-clean:
8688
rm -f libpgport.a libpgport_srv.a$(LIBOBJS)$(LIBOBJS_SRV) pg_config_paths.h

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp