1 files changed, 19 insertions, 3 deletions

diff --git a/src/makecolumns.sh b/src/makecolumns.sh
index d53b26b..1faa876 100644
--- a/src/makecolumns.sh
+++ b/src/makecolumns.sh
@@ -1,9 +1,23 @@
 #!/bin/sh
 
-EL=`dirname $0`/el
-HO=`dirname $0`/hexout
+EL=`dirname $0`/../bin/el
+HO=`dirname $0`/../bin/hexout
 
-numfiles=`ls file_* | wc -l`
+if [ $# -ne 2 ]; then
+  echo "Syntax: $0 [phonebookdirectory]"
+  exit 1
+fi
+
+make -f Makefile all
+
+../bin/decompress $1/streets.tl
+
+cat file_* > streets
+rm file_*
+
+../bin/decompress $1/phonebook.db
+
+numfiles=`find . -name file_\* | wc -l`
 
 for column in `jot - 0 11 1`; do
   for file in `jot - ${column} ${numfiles} 11`; do
@@ -35,3 +49,5 @@ if [ -e 99_Strassenname ]; then
 else
   echo Could not convert streetindexes
 fi
+
+find . -name file_\* -delete