From 6d2de4dc689fa5503e7022f940a73baa5c3aa797 Mon Sep 17 00:00:00 2001
From: Rick Altherr <kc8apf@kc8apf.net>
Date: Wed, 15 Nov 2017 03:13:09 -0500
Subject: [PATCH] utils/mergedb: fix tools paths

Signed-off-by: Rick Altherr <kc8apf@kc8apf.net>
Signed-off-by: Tim 'mithro' Ansell <mithro@mithis.com>
---
 utils/mergedb.sh | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/utils/mergedb.sh b/utils/mergedb.sh
index 5a7c2ef3..9b400a7c 100644
--- a/utils/mergedb.sh
+++ b/utils/mergedb.sh
@@ -1,7 +1,5 @@
 #!/bin/bash
 
-source environment.sh
-
 set -ex
 test $# = 2
 test -e "$2"
@@ -48,7 +46,7 @@ case "$1" in
 		exit 1
 esac
 
-db=../../database/$XRAY_DATABASE/seg_$1.segbits
+db=$XRAY_DATABASE_DIR/$XRAY_DATABASE/seg_$1.segbits
 touch "$db"
 sort -u "$tmp1" "$db" | grep -v '<.*>' > "$tmp2"
 mv "$tmp2" "$db"