From: Gary V. Vaughan <gary@gnu.org>
Date: Thu, 2 Jan 2014 00:04:31 +0000 (+1300)
Subject: bootstrap: push Peter's version sort fix back into funclib.sh.
X-Git-Tag: v2.4.3~39
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=581d90bacaec6c20d5a5f776bdcdd9512f724192;p=thirdparty%2Flibtool.git

bootstrap: push Peter's version sort fix back into funclib.sh.

Peter's a7462c5 fix was applied to the generated bootstrap script
instead of the funclib.sh source, and had have been overwritten
the next time bootstrap was regenerated.
* gl/build-aux/funclib.sh (func_sort_ver): Sort numerically on the
non-primary keys as well.
* bootstrap: Regenerate, with the change applied.

Signed-off-by: Gary V. Vaughan <gary@gnu.org>
---

diff --git a/bootstrap b/bootstrap
index 6b4cc6d5a..18323ebb4 100755
--- a/bootstrap
+++ b/bootstrap
@@ -1327,8 +1327,8 @@ func_sort_ver ()
 {
     $debug_cmd
 
-    printf '%s\n%s\n' "$1" "$2" |
-    sort -t. -k 1,1n -k 2,2n -k 3,3n -k 4,4n -k 5,5n -k 6,6n -k 7,7n -k 8,8n -k 9,9n
+    printf '%s\n%s\n' "$1" "$2" \
+      | sort -t. -k 1,1n -k 2,2n -k 3,3n -k 4,4n -k 5,5n -k 6,6n -k 7,7n -k 8,8n -k 9,9n
 }
 
 # func_lt_ver PREV CURR
diff --git a/gl/build-aux/funclib.sh b/gl/build-aux/funclib.sh
index 73b3e2637..3bd2ab8a5 100644
--- a/gl/build-aux/funclib.sh
+++ b/gl/build-aux/funclib.sh
@@ -1317,8 +1317,8 @@ func_sort_ver ()
 {
     $debug_cmd
 
-    printf '%s\n%s\n' "$1" "$2" |
-    sort -t. -k1n -k1 -k2n -k2 -k3n -k3 -k4n -k4 -k5n -k5 -k6n -k6 -k7n -k7 -k8n -k8 -k9n -k9
+    printf '%s\n%s\n' "$1" "$2" \
+      | sort -t. -k 1,1n -k 2,2n -k 3,3n -k 4,4n -k 5,5n -k 6,6n -k 7,7n -k 8,8n -k 9,9n
 }
 
 # func_lt_ver PREV CURR