aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBruce Momjian <bruce@momjian.us>2003-01-26 01:19:22 +0000
committerBruce Momjian <bruce@momjian.us>2003-01-26 01:19:22 +0000
commitdc87ea755c6b63088e77b523de09d87f4fd78471 (patch)
tree9154b2daece72c7d6b4854d9a36f47c7b1f304f4
parent677d77817dc0b7d17edd1aaf5526d7b2f9b4309c (diff)
downloadpostgresql-dc87ea755c6b63088e77b523de09d87f4fd78471.tar.gz
postgresql-dc87ea755c6b63088e77b523de09d87f4fd78471.zip
Include IPv6 addresses in pg_hba.conf even if IPv6 is not supported; at
suggestion of Peter.
-rw-r--r--src/backend/Makefile12
1 files changed, 1 insertions, 11 deletions
diff --git a/src/backend/Makefile b/src/backend/Makefile
index 80df8b96bee..ec4c179c7ab 100644
--- a/src/backend/Makefile
+++ b/src/backend/Makefile
@@ -4,7 +4,7 @@
#
# Copyright (c) 1994, Regents of the University of California
#
-# $Header: /cvsroot/pgsql/src/backend/Makefile,v 1.92 2003/01/07 15:12:17 momjian Exp $
+# $Header: /cvsroot/pgsql/src/backend/Makefile,v 1.93 2003/01/26 01:19:22 momjian Exp $
#
#-------------------------------------------------------------------------
@@ -132,14 +132,7 @@ ifeq ($(MAKE_DLL), true)
endif
endif
$(MAKE) -C catalog install-data
-ifdef HAVE_IPV6
$(INSTALL_DATA) $(srcdir)/libpq/pg_hba.conf.sample $(DESTDIR)$(datadir)/pg_hba.conf.sample
-else
- grep -v '^host.*::1.*ffff:ffff:ffff:ffff:ffff:ffff' \
- $(srcdir)/libpq/pg_hba.conf.sample \
- > $(srcdir)/libpq/pg_hba.conf.sample.no_ipv6
- $(INSTALL_DATA) $(srcdir)/libpq/pg_hba.conf.sample.no_ipv6 $(DESTDIR)$(datadir)/pg_hba.conf.sample
-endif
$(INSTALL_DATA) $(srcdir)/libpq/pg_service.conf.sample $(DESTDIR)$(datadir)/pg_service.conf.sample
$(INSTALL_DATA) $(srcdir)/libpq/pg_ident.conf.sample $(DESTDIR)$(datadir)/pg_ident.conf.sample
$(INSTALL_DATA) $(srcdir)/utils/misc/postgresql.conf.sample $(DESTDIR)$(datadir)/postgresql.conf.sample
@@ -191,9 +184,6 @@ clean:
rm -f postgres$(X) $(POSTGRES_IMP) \
$(top_srcdir)/src/include/parser/parse.h \
$(top_builddir)/src/include/utils/fmgroids.h
-ifndef HAVE_IPV6
- rm -f $(srcdir)/libpq/pg_hba.conf.sample.no_ipv6
-endif
ifeq ($(PORTNAME), win)
rm -f postgres.dll postgres.def libpostgres.a
endif