Modified to allow updating files other than config.{sub,guess}

1 files changed, 46 insertions, 17 deletions

diff --git a/eclass/gnuconfig.eclass b/eclass/gnuconfig.eclass
index bb0b681ddcbf..a3bae4b6b02b 100644
--- a/eclass/gnuconfig.eclass
+++ b/eclass/gnuconfig.eclass
@@ -1,11 +1,20 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/gnuconfig.eclass,v 1.6 2003/02/28 09:15:04 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/gnuconfig.eclass,v 1.7 2003/03/10 21:44:59 wwoods Exp $
 #
 # Author: Will Woods <wwoods@gentoo.org>
 #
-# This eclass updates config.guess and config.sub. This is useful if 
-# configure dies from misguessing your canonical system name (CHOST).
+# This eclass is used to automatically update files that typically come with 
+# automake to the newest version available on the system. The most common use
+# of this is to update config.guess and config.sub when configure dies from
+# misguessing your canonical system name (CHOST). It can also be used to update
+# other files that come with automake, e.g. depcomp, mkinstalldirs, etc.
+#
+# usage: gnuconfig_update [file1 file2 ...]
+# if called without arguments, config.guess and config.sub will be updated.
+# All files in the source tree ($S) with the given name(s) will be replaced
+# with the newest available versions chosen from the list of locations in 
+# gnuconfig_findnewest(), below.
 
 ECLASS=gnuconfig
 INHERITED="$INHERITED $ECLASS"
@@ -14,27 +23,47 @@ newdepend sys-devel/automake
 
 DESCRIPTION="Based on the ${ECLASS} eclass"
 
-# Copy the newest available config.{guess|sub} on the system over any old 
-# ones in the source dir
+# Wrapper function for gnuconfig_do_update. If no arguments are given, update
+# config.sub and config.guess (old default behavior), otherwise update the
+# named files. 
 gnuconfig_update() {
-	local configsubs_dir="$(gnuconfig_findnewest)"
-	local sub
-	local f
-	einfo "Using GNU config files from ${configsubs_dir}"
-	for sub in config.sub config.guess ; do 
-		for f in `find ${S} -name "${sub}"`; do
-			einfo "Updating ${f/$S\//}"
-			cp -f ${configsubs_dir}/${sub} ${f}
-		done
-	done
+    if [ $# -gt 0 ] ; then 
+	gnuconfig_do_update $* 
+    else
+	gnuconfig_do_update config.sub config.guess
+    fi
+}
+
+# Copy the newest available version of specified files over any old ones in the
+# source dir. This function shouldn't be called directly - use gnuconfig_update
+gnuconfig_do_update() {
+    local configsubs_dir="$(gnuconfig_findnewest)"
+    local target targetlist file
+    einfo "Using GNU config files from ${configsubs_dir}"
+    for file in $* ; do 
+	if [ ! -r ${configsubs_dir}/${file} ] ; then
+	    eerror "Can't read ${configsubs_dir}/${file}, skipping.."
+	    continue
+	fi
+	targetlist=`find ${S} -name "${file}"`
+	if [ -n "$targetlist" ] ; then
+	    for target in $targetlist; do
+		einfo "Updating ${target/$S\//}"
+		cp -f ${configsubs_dir}/${file} ${target}
+		eend $!
+	    done
+	else
+	    ewarn "No ${file} found in ${S}, skipping.."
+	fi
+    done
 }
 
 # this searches the standard locations for the newest config.{sub|guess}, and
 # returns the directory where they can be found.
 gnuconfig_findnewest() {
-	local locations="/usr/share/automake-1.6/config.sub \
+    local locations="/usr/share/automake-1.6/config.sub \
                          /usr/share/automake-1.5/config.sub \
                          /usr/share/automake-1.4/config.sub \
                          /usr/share/libtool/config.sub"
-	grep -s '^timestamp' ${locations} | sort -n -t\' -k2 | tail -1 | sed 's,/config.sub:.*$,,'
+    grep -s '^timestamp' ${locations} | sort -n -t\' -k2 | tail -1 | sed 's,/config.sub:.*$,,'
 }