From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Tue, 31 Dec 2019 13:35:58 +0000 (+0000)
Subject: catacomb-import-update: Prepare for out-of-tree builds
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ian/git?a=commitdiff_plain;h=db9573ce419e867352c08aaefb1373627b88a25c;p=secnet.git

catacomb-import-update: Prepare for out-of-tree builds

The input directory should be relative to $0, not to `.'.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/catacomb-import-update b/catacomb-import-update
index de96ca9..792e86c 100755
--- a/catacomb-import-update
+++ b/catacomb-import-update
@@ -879,7 +879,8 @@ die "usage: $PROG --import|--convert\n"
 $DOCONVERT = $1 eq 'convert';
 
 if ($DOCONVERT) {
-  $DONOR_DIR = $DONOR_IMPORT_DIR;
+  $DONOR_DIR = $0;
+  $DONOR_DIR =~ s{[^/]+$}{$DONOR_IMPORT_DIR} or die "$0 ?";
 } else {
   $DONOR_DIR = "../catacomb";
 }