Commit8ccf86b

committed

Still another round of Perl-module installation tweaks.

Now, src/interfaces/perl5/Makefile.PL is pretty simple, and instead wework a little harder in src/interfaces/Makefile.

1 parent1645102 commit8ccf86bCopy full SHA for 8ccf86b

File tree

+17

-3

lines changed

+17

-3

lines changed

Lines changed: 17 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`#-------------------------------------------------------`
`2`	`2`	`#`
`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 $`
`4`	`4`	`#`
`5`	`5`	`# Copyright (c) 1997, 1998 Edmund Mergl`
`6`	`6`	`#`
`@@ -14,19 +14,33 @@ my %opts;`
`14`	`14`
`15`	`15`	`if (!$ENV{POSTGRES_HOME}) {`
`16`	`16`
	`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`
`17`	`28`	my$cwd =`pwd`;
`18`	`29`	`chop$cwd;`
`19`	`30`
`20`	`31`	`%opts = (`
`21`	`32`	`NAME=>'Pg',`
`22`	`33`	`VERSION_FROM=>'Pg.pm',`
`23`		`- INC => "-I$cwd/../libpq -I$cwd/../../include",`
	`34`	`+INC=>"-I../libpq -I../../include",`
`24`	`35`	`OBJECT=>"Pg\$(OBJ_EXT)",`
`25`		`- LIBS => ["-L@prefix@/lib -L$cwd/../libpq -lpq"],`
	`36`	`+LIBS=> ["-L$cwd/../libpq -lpq"],`
`26`	`37`	`);`
`27`	`38`
`28`	`39`	`}else {`
`29`	`40`
	`41`	`+# Setup for final install of Pg using an already-installed libpq,`
	`42`	`+# or for standalone installation when Postgres already is installed.`
	`43`	`+`
`30`	`44`	`%opts = (`
`31`	`45`	`NAME=>'Pg',`
`32`	`46`	`VERSION_FROM=>'Pg.pm',`

Comments

(0)