Skip to content

Commit 0abebf0

Browse files
committed
Remove bogus complexity from build/install of plperl. This stuff was
apparently copied from the makefile for the perl5 interface module, which needs it for reasons explained in src/interfaces/Makefile. But none of those reasons apply to plperl.
1 parent e4739e7 commit 0abebf0

File tree

1 file changed

+3
-23
lines changed

1 file changed

+3
-23
lines changed

src/pl/Makefile

Lines changed: 3 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#
88
#
99
# IDENTIFICATION
10-
# $Header: /cvsroot/pgsql/src/pl/Makefile,v 1.4 2000/03/25 14:25:31 momjian Exp $
10+
# $Header: /cvsroot/pgsql/src/pl/Makefile,v 1.5 2000/03/25 19:26:49 tgl Exp $
1111
#
1212
#-------------------------------------------------------------------------
1313

@@ -21,29 +21,9 @@ ifeq ($(USE_TCL), true)
2121
$(MAKE) -C tcl $@
2222
endif
2323
ifeq ($(USE_PERL), true)
24-
-@if [ "$@" = "install" ]; then \
25-
$(MAKE) $(MFLAGS) install-plperl; \
26-
else \
27-
$(MAKE) $(MFLAGS) plperl/Makefile; \
28-
$(MAKE) $(MFLAGS) -C plperl $@; \
29-
fi
24+
$(MAKE) $(MFLAGS) plperl/Makefile
25+
$(MAKE) $(MFLAGS) -C plperl $@
3026
endif
3127

3228
plperl/Makefile: plperl/Makefile.PL
3329
cd plperl && $(PERL) Makefile.PL POLLUTE=1
34-
35-
install-plperl: plperl/Makefile
36-
$(MAKE) -C plperl clean
37-
cd plperl && POSTGRES_HOME="$(POSTGRESDIR)" $(PERL) Makefile.PL POLLUTE=1
38-
$(MAKE) -C plperl all
39-
-@if [ -w `sed -n -e 's/^ *INSTALLSITELIB *= *//p' plperl/Makefile` ]; then \
40-
$(MAKE) $(MFLAGS) -C plperl install; \
41-
rm -f plperl/Makefile; \
42-
else \
43-
echo "Skipping install of Perl module for lack of permissions."; \
44-
echo "To install it, cd into interfaces/plperl, su to become the"; \
45-
echo "appropriate user, and do '$(MAKE) install'."; \
46-
fi
47-
48-
.PHONY: install-plperl
49-

0 commit comments

Comments
 (0)