[arch-commits] Commit in postgresql/trunk (PKGBUILD)

[Dan McGee]

    Date: Monday, September 26, 2011 @ 18:30:00
  Author: dan
Revision: 138526

Fix stupid overlapping files

Modified:
  postgresql/trunk/PKGBUILD

----------+
 PKGBUILD |   19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-09-26 21:31:09 UTC (rev 138525)
+++ PKGBUILD	2011-09-26 22:30:00 UTC (rev 138526)
@@ -5,7 +5,7 @@
 pkgname=('postgresql-libs' 'postgresql-docs' 'postgresql')
 pkgver=9.1.1
 _majorver=${pkgver%.*}
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url="http://www.postgresql.org/"
 license=('custom:PostgreSQL')
@@ -28,7 +28,7 @@
 
 package_postgresql-libs() {
   pkgdesc="Libraries for use with PostgreSQL"
-  depends=('openssl>=1.0.0')
+  depends=('openssl>=1.0.0' 'readline>=6.0')
   provides=('postgresql-client')
   conflicts=('postgresql-client')
 
@@ -38,13 +38,12 @@
   install -D -m644 COPYRIGHT "${pkgdir}/usr/share/licenses/postgresql-libs/LICENSE"
 
   # install libs
-  for dir in src/interfaces src/bin/pg_config; do
-    pushd ${dir}
-    make DESTDIR="${pkgdir}" install
-    popd
+  for dir in src/interfaces src/bin/pg_config src/bin/psql; do
+    make -C ${dir} DESTDIR="${pkgdir}" install
   done
 
   install -D -m644 doc/src/sgml/man1/pg_config.1 "${pkgdir}/usr/share/man/man1/pg_config.1"
+  install -D -m644 doc/src/sgml/man1/psql.1 "${pkgdir}/usr/share/man/man1/psql.1"
 
   cd src/include
 
@@ -96,9 +95,13 @@
   make DESTDIR="${pkgdir}" install
   make -C contrib DESTDIR="${pkgdir}" install
   make -C doc/src/sgml DESTDIR="${pkgdir}" install-man
-  # we don't want this, it is in the -libs package
-  make -C src/bin/pg_config DESTDIR="${pkgdir}" uninstall
+
+  # we don't want these, they are in the -libs package
+  for dir in src/interfaces src/bin/pg_config src/bin/psql; do
+    make -C ${dir} DESTDIR="${pkgdir}" uninstall
+  done
   rm "${pkgdir}/usr/share/man/man1/pg_config.1"
+  rm "${pkgdir}/usr/share/man/man1/psql.1"
 
   # install license
   install -D -m644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgbase}/LICENSE"