Commit 9f39b9a1 authored by Tom Lane's avatar Tom Lane

Detect lack of permission to install into Perl module library,

and emit informative message instead of aborting the Postgres install.
parent 69545373
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
# #
# #
# IDENTIFICATION # IDENTIFICATION
# $Header: /cvsroot/pgsql/src/interfaces/Makefile,v 1.19 1998/10/18 02:33:56 tgl Exp $ # $Header: /cvsroot/pgsql/src/interfaces/Makefile,v 1.20 1998/10/27 21:27:36 tgl Exp $
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
...@@ -18,7 +18,9 @@ include $(SRCDIR)/Makefile.global ...@@ -18,7 +18,9 @@ include $(SRCDIR)/Makefile.global
# Note: the klugery for perl5 is to ensure that the perl5 shared lib # Note: the klugery for perl5 is to ensure that the perl5 shared lib
# gets built with the correct path to the installed location of libpq # gets built with the correct path to the installed location of libpq
# during "make install", but is built against the local tree during # during "make install", but is built against the local tree during
# ordinary building and testing. # ordinary building and testing. During install, we must also guard
# against the likelihood that we don't have permissions to install into
# the Perl module library.
.DEFAULT all install clean dep depend distclean: .DEFAULT all install clean dep depend distclean:
$(MAKE) -C libpq $@ $(MAKE) -C libpq $@
...@@ -49,7 +51,14 @@ perl5/Makefile: perl5/Makefile.PL ...@@ -49,7 +51,14 @@ perl5/Makefile: perl5/Makefile.PL
install-perl5: install-perl5:
$(MAKE) -C perl5 clean $(MAKE) -C perl5 clean
cd perl5 && POSTGRES_HOME="$(POSTGRESDIR)" perl Makefile.PL cd perl5 && POSTGRES_HOME="$(POSTGRESDIR)" perl Makefile.PL
$(MAKE) -C perl5 install $(MAKE) -C perl5 all
rm -f perl5/Makefile if [ -w `sed -n -e 's/^ *SITELIBEXP *= *//p' perl5/Makefile` ]; then \
$(MAKE) $(MFLAGS) -C perl5 install; \
rm -f perl5/Makefile; \
else \
echo "Skipping install of Perl module for lack of permissions."; \
echo "To install it, cd into interfaces/perl5, su to become the"; \
echo "appropriate user, and do '$(MAKE) install'."; \
fi
.PHONY: install-perl5 .PHONY: install-perl5
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment