diff options
| author |   Aaron W. Swenson <titanofold@gentoo.org> | 2011-03-21 23:05:36 -0400 |
|---|---|---|
| committer | Aaron W. Swenson <titanofold@gentoo.org> | 2011-03-21 23:05:36 -0400 |
| commit | c1cc547ec1e48a967d9f65cab29ffc4e89053a39 (patch) | |
| tree | 3fec0baa0d37fd89aa4da4cc3156fb219432fe08 | |
| parent | Initial commit of the 1.0 series of postgresql.eselect. A module that manages (diff) | |
| download | eselect-c1cc547ec1e48a967d9f65cab29ffc4e89053a39.tar.gz eselect-c1cc547ec1e48a967d9f65cab29ffc4e89053a39.tar.bz2 eselect-c1cc547ec1e48a967d9f65cab29ffc4e89053a39.zip | |
Fixing lib references. ${EROOT}/usr/lib(64)?/postgresql-${SLOT}/lib(64)?/
| -rw-r--r-- | postgresql.eselect | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/postgresql.eselect b/postgresql.eselect index 7805d34..06896c9 100644 --- a/postgresql.eselect +++ b/postgresql.eselect @@ -1,4 +1,4 @@ -# Copyright 1999-2008 Gentoo Foundation +# Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id: $ @@ -7,7 +7,7 @@ inherit config multilib output package-manager path-manipulation DESCRIPTION="Manage active PostgreSQL client applications and libraries" MAINTAINER="pgsql-bugs@gentoo.org" SVN_DATE='$Date: $' -VERSION="1.0.3" +VERSION="1.0.4" # Global Data B_PATH="${EROOT%/}/usr" @@ -166,13 +166,13 @@ do_set() { # Link modules to /usr/lib{,lib32,lib64}/ for x in ${LIB_LIST} ; do - if [ -d ${B_PATH}/${x}/postgresql-${SLOT}/lib ] ; then + if [ -d ${B_PATH}/${x}/postgresql-${SLOT}/${x} ] ; then # 'linker' function doesn't work for linking directories. # Default lib path - ln -s ${B_PATH}/${x}/postgresql-${SLOT}/lib ${B_PATH}/${x}/postgresql + ln -s ${B_PATH}/${x}/postgresql-${SLOT}/${x} ${B_PATH}/${x}/postgresql echo ${B_PATH}/${x}/postgresql >> ${E_PATH}/active.links # Linker works for files - linker "${B_PATH}/${x}/postgresql-${SLOT}/lib/lib*.{a,so}" "${B_PATH}/${x}" + linker "${B_PATH}/${x}/postgresql-${SLOT}/${x}/lib*.{a,dylib,so}" "${B_PATH}/${x}" fi done @@ -279,7 +279,7 @@ do_update() { while [ $[--index] -gt -1 ] ; do echo -e "\n\033[1mGenerating symbolic links for ${slots[$index]} applications...\033[0m" for x in ${LIB_LIST} ; do - local lib_path="${B_PATH}/${x}/postgresql-${slots[$index]}/lib/" + local lib_path="${B_PATH}/${x}/postgresql-${slots[$index]}/${x}/" [ -d ${lib_path} ] && ldpath+=":${lib_path}" done local share_path="${B_PATH}/share/postgresql-${slots[$index]}/" |