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

Commitcfc0e01

Browse files
committed
Our test to see if we had permission to install into Perl5 install area
always failed if Perl makefile's INSTALLSITELIB variable was specifiedin terms of another variable. Fix by adding an echo-installdir targetto the Perl makefile, which the upper-level Makefile can invoke.
1 parent2ee858b commitcfc0e01

File tree

2 files changed

+13
-5
lines changed

2 files changed

+13
-5
lines changed

‎src/interfaces/Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#
88
#
99
# IDENTIFICATION
10-
# $Header: /cvsroot/pgsql/src/interfaces/Makefile,v 1.35 2000/04/20 17:21:46 momjian Exp $
10+
# $Header: /cvsroot/pgsql/src/interfaces/Makefile,v 1.36 2000/04/23 04:26:31 tgl Exp $
1111
#
1212
#-------------------------------------------------------------------------
1313

@@ -53,7 +53,7 @@ install-perl5: perl5/Makefile
5353
$(MAKE) -C perl5 clean
5454
cd perl5&& POSTGRES_HOME="$(POSTGRESDIR)"$(PERL) Makefile.PL POLLUTE=1
5555
$(MAKE) -C perl5 all
56-
-@if [-w`sed -n -e's/^ *INSTALLSITELIB *= *//p'perl5/Makefile` ];then\
56+
-@if [-w`$(MAKE) --quiet -Cperl5 echo-installdir` ];then\
5757
$(MAKE)$(MFLAGS) -C perl5 install;\
5858
rm -f perl5/Makefile;\
5959
else\

‎src/interfaces/perl5/Makefile.PL‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#-------------------------------------------------------
22
#
3-
# $Id: Makefile.PL,v 1.14 1998/10/18 02:36:48 tgl Exp $
3+
# $Id: Makefile.PL,v 1.15 2000/04/23 04:26:32 tgl Exp $
44
#
55
# Copyright (c) 1997, 1998 Edmund Mergl
66
#
@@ -53,6 +53,14 @@ where Postgres is installed (often /usr/local/pgsql).\n";
5353

5454
WriteMakefile(%opts);
5555

56-
exit(0);
5756

58-
# end of Makefile.PL
57+
subMY::installbin {
58+
59+
q[
60+
# Create a target that interfaces/Makefile can use to
61+
# determine the Perl install directory.
62+
echo-installdir:
63+
@echo $(INSTALLSITELIB)
64+
];
65+
66+
}

0 commit comments

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