From 8910351c76af983411e09e04aff86ea5d9940cf1 Mon Sep 17 00:00:00 2001
From: Ondrej Filip <feela@network.cz>
Date: Wed, 8 Sep 2004 16:06:07 +0000
Subject: [PATCH] sort from GNU coreutils 5.2.1 doesn't accept the +- syntax
 anymore. Hopefully the -k syntax is supported by all other sort versions

---
 tools/mergedirs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/mergedirs b/tools/mergedirs
index 33bcbdaa..883e6f17 100755
--- a/tools/mergedirs
+++ b/tools/mergedirs
@@ -24,7 +24,7 @@ MODULES=`for a in $@ ; do
 		$cpp -U unix -D MACROS_ONLY -I $OBJDIR - |
 		sed "/^[ ]*\$/d;/^#/d;s@\\(.*\\)@\\1 $a/\\1@"
 		done |
-	sort +0 -1 -u |
+	sort -k1,1 -u |
 	cut -d ' ' -f 2`
 rm -rf $LIBDIR $CONFDIR
 mkdir -p $LIBDIR $CONFDIR