[packages_10.03.2] postgresql: merge r27856, r29199

git-svn-id: svn://svn.openwrt.org/openwrt/branches/packages_10.03.2@30060 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/libs/postgresql/Makefile b/libs/postgresql/Makefile
index 2120155..8f91b51 100644 (file)
--- a/libs/postgresql/Makefile
+++ b/libs/postgresql/Makefile
@@ -1,5 +1,5 @@
 #
 #

-# Copyright (C) 2006-2010 OpenWrt.org
+# Copyright (C) 2006-2011 OpenWrt.org

 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.


@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=postgresql
 PKG_VERSION:=9.0.1
 
 PKG_NAME:=postgresql
 PKG_VERSION:=9.0.1

-PKG_RELEASE:=1
+PKG_RELEASE:=2

 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=\
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=\


@@ -156,6 +156,9 @@ endef
 
 TARGET_CFLAGS += $(FPIC)
 
 
 TARGET_CFLAGS += $(FPIC)
 

+# because PROFILE means something else in the project Makefile
+unexport PROFILE
+

 define Build/Compile
        $(MAKE) $(PKG_JOBS) -C "$(PKG_BUILD_DIR)" \
                DESTDIR="$(PKG_INSTALL_DIR)" \
 define Build/Compile
        $(MAKE) $(PKG_JOBS) -C "$(PKG_BUILD_DIR)" \
                DESTDIR="$(PKG_INSTALL_DIR)" \


@@ -196,6 +199,10 @@ define Package/pgsql-server/install
                $(1)/usr/lib
 endef
 
                $(1)/usr/lib
 endef
 

+define Package/pgsql-server/conffiles
+/etc/config/postgresql
+endef
+

 define Package/pgsql-server/postinst
 #!/bin/sh
 grep -q '^postgres:' /etc/passwd && exit 0
 define Package/pgsql-server/postinst
 #!/bin/sh
 grep -q '^postgres:' /etc/passwd && exit 0