1 files changed, 20 insertions, 1 deletions
diff --git a/abuild.in b/abuild.in
index cc3abad..e35aa58 100755
--- a/abuild.in
+++ b/abuild.in
@@ -494,6 +494,24 @@ unpack() {
 	default_unpack
 }
 
+default_post_unpack() {
+	local i
+	options_has "!configsub" && return 0
+	for i in "$srcdir"/*/configure; do
+		[ -x "$i" ] || continue
+		find "${i%/configure}" -name config.sub -o -name config.guess \
+			| while read f; do
+				msg "Replacing ${f##*/}"
+				cp "$datadir"/${f##*/} "$f" || return 1
+			done
+		break
+	done
+}
+
+post_unpack() {
+	default_post_unpack
+}
+
 # cleanup source and package dir
 clean() {
 	msg "Cleaning temporary build dirs..."
@@ -1177,7 +1195,8 @@ build_abuildrepo() {
 	if ! apk_up2date || [ -n "$force" ]; then
 		logcmd "building $pkgname"
 		sanitycheck && builddeps && clean && fetch && unpack \
-			&& prepare && mkusers && rootpkg || return 1
+			&& post_unpack && prepare && mkusers && rootpkg \
+			|| return 1
 	fi
 	update_abuildrepo_index
 }