From ad5291eb8da8ae4106c6fbc90c8d9049006b464f Mon Sep 17 00:00:00 2001
From: Mike Gerwitz <mikegerwitz@gnu.org>
Date: Mon, 7 Jul 2014 23:49:31 -0400
Subject: [PATCH] Corrected tools/combine to handle relative require paths

---
 tools/combine | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/tools/combine b/tools/combine
index 9b804d5..c6aa7b2 100755
--- a/tools/combine
+++ b/tools/combine
@@ -33,8 +33,13 @@ RMTRAIL="$PATH_TOOLS/rmtrail"
 cat_modules=$(
     cd "$PATH_TOOLS/../" &&
     grep -rIo ' require(.*)' lib/ \
-        | sed "s/^lib\///;s/\.js://;s/require( *'\.\/\(.*\)'.*/\1/" \
-        | node tools/combine-order.js
+        | sed " \
+            s/^lib\/\(\(.\+\/\)\?[^/]\+\)\.js: /\1 \2/;
+            s/require( *'\(.*\)'.*/\1/;
+            s/[^/\]\+\/\.\.//g;
+            s/\( \|\/\)\.\//\1/g;
+        " \
+        | node tools/combine-order.js \
 ) || {
     echo "Failed to get module list" >&2
     exit 3