From a1a66988339c2da103af000a763880d425769fc9 Mon Sep 17 00:00:00 2001
From: Nagy Karoly Gabriel <nagy.karoly@opensde.org>
Date: Wed, 14 Sep 2011 14:40:41 +0200
Subject: [PATCH] postgresql: Fixed to actually install the package, capability
 lost at d01a73e989c35981e85fae710a3420859139deda.

---
 database/postgresql/build_contrib.diff | 25 +++++++++++++++++--------
 database/postgresql/postgresql.conf    |  5 ++++-
 2 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/database/postgresql/build_contrib.diff b/database/postgresql/build_contrib.diff
index 6adc16d94..fefa156fc 100644
--- a/database/postgresql/build_contrib.diff
+++ b/database/postgresql/build_contrib.diff
@@ -14,14 +14,23 @@
 # version.
 # --- SDE-COPYRIGHT-NOTE-END ---
 
---- ./GNUmakefile.in.orig	2011-09-08 23:13:27.000000000 +0200
-+++ ./GNUmakefile.in	2011-09-14 13:52:24.616084457 +0200
-@@ -8,7 +8,7 @@
- top_builddir = .
- include $(top_builddir)/src/Makefile.global
+--- ./GNUmakefile.in.orig	2011-09-14 14:30:08.888084448 +0200
++++ ./GNUmakefile.in	2011-09-14 14:31:10.616084684 +0200
+@@ -16,7 +16,7 @@
+ docs:
+ 	$(MAKE) -C doc all
  
--$(call recurse,all install,src config)
+-$(call recurse,world,doc src config contrib,all)
 +$(call recurse,world,src config contrib,all)
+ world:
+ 	+@echo "PostgreSQL, contrib, and documentation successfully made. Ready to install."
+ 
+@@ -32,7 +32,7 @@
+ install-docs:
+ 	$(MAKE) -C doc install
+ 
+-$(call recurse,install-world,doc src config contrib,install)
++$(call recurse,install-world,src config contrib,install)
+ install-world:
+ 	+@echo "PostgreSQL, contrib, and documentation installation complete."
  
- all:
- 	+@echo "All of PostgreSQL successfully made. Ready to install."
diff --git a/database/postgresql/postgresql.conf b/database/postgresql/postgresql.conf
index 689e0103e..9052764c8 100644
--- a/database/postgresql/postgresql.conf
+++ b/database/postgresql/postgresql.conf
@@ -30,8 +30,11 @@ fi
 
 # check if we should build and install the contributed 3rd. party
 # applications and tools
-[ "$SDECFG_PKG_POSTGRESQL_CONTRIB" == 0 ] ||
+if [ "$SDECFG_PKG_POSTGRESQL_CONTRIB" == 1 ]; then
 	var_append patchfiles ' ' "$confdir/build_contrib.diff"
+	var_append makeopt ' ' "world"
+	var_append makeinstopt ' ' "install-world"
+fi
 
 var_append extraconfopt " " "--with-gnu-ld"