diff options
| author |   Matthias Schwarzott <zzam@gentoo.org> | 2008-05-16 13:52:16 +0000 |
|---|---|---|
| committer | Matthias Schwarzott <zzam@gentoo.org> | 2008-05-16 13:52:16 +0000 |
| commit | 0e83ffa7d70bd64d05a922d41e545c194b91b8e3 (patch) | |
| tree | 8e1d153a312c16d3f7bdae108cb3b92bb5885935 /eclass | |
| parent | Version bump. (diff) | |
| download | historical-0e83ffa7d70bd64d05a922d41e545c194b91b8e3.tar.gz historical-0e83ffa7d70bd64d05a922d41e545c194b91b8e3.tar.bz2 historical-0e83ffa7d70bd64d05a922d41e545c194b91b8e3.zip | |
Revert installing libs to a different tmp directory. Install to $S as before.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/vdr-plugin.eclass | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/eclass/vdr-plugin.eclass b/eclass/vdr-plugin.eclass index 42066cdc8977..7fca1f496553 100644 --- a/eclass/vdr-plugin.eclass +++ b/eclass/vdr-plugin.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/vdr-plugin.eclass,v 1.60 2008/05/15 14:03:15 zzam Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/vdr-plugin.eclass,v 1.61 2008/05/16 13:52:16 zzam Exp $ # # Author: # Matthias Schwarzott <zzam@gentoo.org> @@ -365,8 +365,6 @@ vdr-plugin_pkg_setup() { TMP_LOCALE_DIR="${WORKDIR}/tmp-locale" LOCDIR="/usr/share/vdr/locale" - TMP_LIBDIR="${WORKDIR}/tmp-libdir" - VDRVERSION=$(awk -F'"' '/define VDRVERSION/ {print $2}' "${VDR_INCLUDE_DIR}"/config.h) APIVERSION=$(awk -F'"' '/define APIVERSION/ {print $2}' "${VDR_INCLUDE_DIR}"/config.h) [[ -z ${APIVERSION} ]] && APIVERSION="${VDRVERSION}" @@ -432,11 +430,10 @@ vdr-plugin_src_compile() { fi cd "${S}" - mkdir -p "${TMP_LIBDIR}" emake ${BUILD_PARAMS} \ ${VDRPLUGIN_MAKE_TARGET:-all} \ LOCALEDIR="${TMP_LOCALE_DIR}" \ - LIBDIR="${TMP_LIBDIR}" \ + LIBDIR="${S}" \ TMPDIR="${T}" \ || die "emake failed" ;; @@ -469,16 +466,17 @@ vdr-plugin_src_install() { fi - local p_list="" p_name - cd "${TMP_LIBDIR}" + cd "${S}" + insinto "${VDR_PLUGIN_DIR}" + doins libvdr-*.so.* + + # create list of all created plugin libs + local p_list="" p_name for p in libvdr-*.so.*; do p_name="${p%.so*}" p_name="${p_name#lib}" p_list="${p_list} ${p_name}" - - insinto "${VDR_PLUGIN_DIR}" - doins "$p" done create_header_checksum_file ${p_list} |