Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 8ccf86b

Browse files
committed
Still another round of Perl-module installation tweaks.
Now, src/interfaces/perl5/Makefile.PL is pretty simple, and instead we work a little harder in src/interfaces/Makefile.
1 parent 1645102 commit 8ccf86b

File tree

1 file changed

+17
-3
lines changed

1 file changed

+17
-3
lines changed

src/interfaces/perl5/Makefile.PL.in renamed to src/interfaces/perl5/Makefile.PL

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#-------------------------------------------------------
22
#
3-
# $Id: Makefile.PL.in,v 1.1 1998/10/16 05:58:22 momjian Exp $
3+
# $Id: Makefile.PL,v 1.14 1998/10/18 02:36:48 tgl Exp $
44
#
55
# Copyright (c) 1997, 1998 Edmund Mergl
66
#
@@ -14,19 +14,33 @@ my %opts;
1414

1515
if (! $ENV{POSTGRES_HOME}) {
1616

17+
# Check that we actually are inside the Postgres source tree
18+
if (! -d "../libpq") {
19+
die
20+
"To install Pg separately from the Postgres distribution,
21+
you must set environment variable POSTGRES_HOME to point to
22+
where Postgres is installed (often /usr/local/pgsql).\n";
23+
}
24+
25+
# Setup for build/test inside a Postgres source tree
26+
27+
# Perl may complain if path to libpq isn't absolute
1728
my $cwd = `pwd`;
1829
chop $cwd;
1930

2031
%opts = (
2132
NAME => 'Pg',
2233
VERSION_FROM => 'Pg.pm',
23-
INC => "-I$cwd/../libpq -I$cwd/../../include",
34+
INC => "-I../libpq -I../../include",
2435
OBJECT => "Pg\$(OBJ_EXT)",
25-
LIBS => ["-L@prefix@/lib -L$cwd/../libpq -lpq"],
36+
LIBS => ["-L$cwd/../libpq -lpq"],
2637
);
2738

2839
} else {
2940

41+
# Setup for final install of Pg using an already-installed libpq,
42+
# or for standalone installation when Postgres already is installed.
43+
3044
%opts = (
3145
NAME => 'Pg',
3246
VERSION_FROM => 'Pg.pm',

0 commit comments

Comments
 (0)