[pkg-haskell-tools] 02/04: Use dht debian2dsc in make-all

Joachim Breitner nomeata at moszumanska.debian.org
Thu Aug 13 12:12:57 UTC 2015


This is an automated email from the git hooks/post-receive script.

nomeata pushed a commit to branch master
in repository pkg-haskell-tools.

commit 63fb1fdc0a34e2c424c853df076091e719d4e808
Author: Joachim Breitner <mail at joachim-breitner.de>
Date:   Thu Aug 13 13:58:03 2015 +0200

    Use dht debian2dsc in make-all
---
 dht             | 1 +
 src/make-all.hs | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/dht b/dht
index ca63c32..5b873a2 100755
--- a/dht
+++ b/dht
@@ -17,6 +17,7 @@ if ($Bin eq "/usr/bin") {
 } else {
 	$DHT_SCRIPT_DIR = "$Bin/scripts";
 	$ENV{PERL5LIB} = "$Bin/lib" . $ENV{PERL5LIB};
+	$ENV{PATH} = "$Bin:$ENV{PATH}";
 }
 
 $ENV{DHT_SCRIPT_DIR} = $DHT_SCRIPT_DIR;
diff --git a/src/make-all.hs b/src/make-all.hs
index 76dc52e..20684aa 100644
--- a/src/make-all.hs
+++ b/src/make-all.hs
@@ -374,6 +374,6 @@ shakeMain conf@(Conf {..}) = do
         ensureVersion source version
         sourceFiles <- getDirectoryFiles ("p" </> source) ["debian//*"]
         need [ "p" </> source </> f | f <- sourceFiles]
-        unit $ cmd  (EchoStdout False) "./debian2dsc.sh" "-o" targetDir ("p" </> source </> "debian")
+        unit $ cmd  (EchoStdout False) "dht" "debian2dsc" "-o" targetDir ("p" </> source </> "debian")
 
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-haskell/pkg-haskell-tools.git



More information about the Pkg-haskell-commits mailing list