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

Commit1645102

Browse files
committed
Still another round of Perl-module installation tweaks.
This time, src/interfaces/perl5/Makefile.PL no longer needs to be autoconf'd.
1 parentf2ca34d commit1645102

File tree

4 files changed

+20
-10
lines changed

4 files changed

+20
-10
lines changed

‎src/GNUmakefile.in‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#
88
#
99
# IDENTIFICATION
10-
# $Header: /cvsroot/pgsql/src/Attic/GNUmakefile.in,v 1.39 1998/10/17 03:49:59 momjian Exp $
10+
# $Header: /cvsroot/pgsql/src/Attic/GNUmakefile.in,v 1.40 1998/10/18 02:33:54 tgl Exp $
1111
#
1212
#-------------------------------------------------------------------------
1313

@@ -102,7 +102,6 @@ distclean: clean
102102
interfaces/libpgtcl/Makefile \
103103
interfaces/odbc/GNUmakefile \
104104
interfaces/odbc/Makefile.global \
105-
interfaces/perl5/Makefile.PL \
106105
pl/plpgsql/src/Makefile \
107106
pl/plpgsql/src/mklang.sql \
108107
pl/tcl/mkMakefile.tcldefs.sh

‎src/configure‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6316,7 +6316,6 @@ trap 'rm -fr `echo "GNUmakefile
63166316
interfaces/libpgtcl/Makefile
63176317
interfaces/odbc/GNUmakefile
63186318
interfaces/odbc/Makefile.global
6319-
interfaces/perl5/Makefile.PL
63206319
pl/plpgsql/src/Makefile
63216320
pl/plpgsql/src/mklang.sql
63226321
pl/tcl/mkMakefile.tcldefs.sh
@@ -6479,7 +6478,6 @@ CONFIG_FILES=\${CONFIG_FILES-"GNUmakefile
64796478
interfaces/libpgtcl/Makefile
64806479
interfaces/odbc/GNUmakefile
64816480
interfaces/odbc/Makefile.global
6482-
interfaces/perl5/Makefile.PL
64836481
pl/plpgsql/src/Makefile
64846482
pl/plpgsql/src/mklang.sql
64856483
pl/tcl/mkMakefile.tcldefs.sh

‎src/configure.in‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -891,7 +891,6 @@ AC_OUTPUT(
891891
interfaces/libpgtcl/Makefile
892892
interfaces/odbc/GNUmakefile
893893
interfaces/odbc/Makefile.global
894-
interfaces/perl5/Makefile.PL
895894
pl/plpgsql/src/Makefile
896895
pl/plpgsql/src/mklang.sql
897896
pl/tcl/mkMakefile.tcldefs.sh

‎src/interfaces/Makefile‎

Lines changed: 19 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,18 @@
77
#
88
#
99
# IDENTIFICATION
10-
# $Header: /cvsroot/pgsql/src/interfaces/Makefile,v 1.18 1998/10/16 15:31:04 momjian Exp $
10+
# $Header: /cvsroot/pgsql/src/interfaces/Makefile,v 1.19 1998/10/18 02:33:56 tgl Exp $
1111
#
1212
#-------------------------------------------------------------------------
1313

1414
SRCDIR= ..
1515
include$(SRCDIR)/Makefile.global
1616

1717

18-
PERL_CLEAN := DO_NOTHING
18+
# Note: the klugery for perl5 is to ensure that the perl5 shared lib
19+
# gets built with the correct path to the installed location of libpq
20+
# during "make install", but is built against the local tree during
21+
# ordinary building and testing.
1922

2023
.DEFAULTallinstallcleandepdependdistclean:
2124
$(MAKE) -C libpq$@
@@ -29,13 +32,24 @@ ifeq ($(USE_TCL), true)
2932
$(MAKE) -C libpgtcl $@
3033
endif
3134
ifeq ($(USE_PERL), true)
32-
-$(MAKE) -C perl5 $(PERL_CLEAN)
33-
$(MAKE) perl5/Makefile
34-
$(MAKE) -C perl5 $@
35+
if [ "$@" = "install" ]; then \
36+
$(MAKE) $(MFLAGS) install-perl5; \
37+
else \
38+
$(MAKE) $(MFLAGS) perl5/Makefile; \
39+
$(MAKE) $(MFLAGS) -C perl5 $@; \
40+
fi
3541
endif
3642
ifeq ($(USE_ODBC), true)
3743
$(MAKE) -C odbc $@
3844
endif
3945

4046
perl5/Makefile: perl5/Makefile.PL
4147
cd perl5&& perl Makefile.PL
48+
49+
install-perl5:
50+
$(MAKE) -C perl5 clean
51+
cd perl5&& POSTGRES_HOME="$(POSTGRESDIR)" perl Makefile.PL
52+
$(MAKE) -C perl5 install
53+
rm -f perl5/Makefile
54+
55+
.PHONY: install-perl5

0 commit comments

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