summaryrefslogtreecommitdiff
path: root/eclass
diff options
context:
space:
mode:
authorMatthias Schwarzott <zzam@gentoo.org>2006-03-15 09:48:53 +0000
committerMatthias Schwarzott <zzam@gentoo.org>2006-03-15 09:48:53 +0000
commita5e8f8941cd22ab8f99f4020f2fa90dcbb43cc6f (patch)
tree4e2568bec6ba6849200fc1c9dddc8cb7459a45b4 /eclass
parentFix for building with java 1.5, close bug #125824 (diff)
downloadgentoo-2-a5e8f8941cd22ab8f99f4020f2fa90dcbb43cc6f.tar.gz
gentoo-2-a5e8f8941cd22ab8f99f4020f2fa90dcbb43cc6f.tar.bz2
gentoo-2-a5e8f8941cd22ab8f99f4020f2fa90dcbb43cc6f.zip
keep checksum sort order consistent with startskript - use existing file if possible
Diffstat (limited to 'eclass')
-rw-r--r--eclass/vdr-plugin.eclass22
1 files changed, 13 insertions, 9 deletions
diff --git a/eclass/vdr-plugin.eclass b/eclass/vdr-plugin.eclass
index 8bc7200a237c..a4b8f1c8ebb0 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.15 2006/03/15 09:14:37 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/vdr-plugin.eclass,v 1.16 2006/03/15 09:48:53 zzam Exp $
#
# Author:
# Matthias Schwarzott <zzam@gentoo.org>
@@ -199,14 +199,18 @@ vdr-plugin_src_install() {
fi
done
- if which md5sum >/dev/null 2>&1; then
- cd ${S}
- insinto /usr/lib/vdr/checksums
- (
- cd ${ROOT}${VDR_INCLUDE_DIR}/vdr
- md5sum *.h libsi/*.h|sort --key=2
- ) > header-md5-${PN}
- doins header-md5-${PN}
+ insinto /usr/lib/vdr/checksums
+ if [[ -f ${ROOT}/usr/lib/vdr/checksums/header-md5-vdr ]]; then
+ newins ${ROOT}/usr/lib/vdr/checksums/header-md5-vdr header-md5-${PN}
+ else
+ if which md5sum >/dev/null 2>&1; then
+ cd ${S}
+ (
+ cd ${ROOT}${VDR_INCLUDE_DIR}/vdr
+ md5sum *.h libsi/*.h|LC_ALL=C sort --key=2
+ ) > header-md5-${PN}
+ doins header-md5-${PN}
+ fi
fi
}