diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2013-04-27 17:27:16 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2013-04-28 23:39:28 +0200 |
| commit | 593987671af63984632ae54eab13f9a47d471ea5 (patch) | |
| tree | 5357bbc2029800750d34ea53864650004c35892f | |
| parent | 5924080dccae93fa725bf77df5f7a1e9a8756101 (diff) | |
| download | guix-593987671af63984632ae54eab13f9a47d471ea5.tar.gz guix-593987671af63984632ae54eab13f9a47d471ea5.zip | |
build-system/gnu: Fix default name for the "doc" output directory.
* guix/build/gnu-build-system.scm (configure)[package-name]: Drop the
prefix corresponding to the hash part of OUT.
| -rw-r--r-- | guix/build/gnu-build-system.scm | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/guix/build/gnu-build-system.scm b/guix/build/gnu-build-system.scm index 94a7d6bca8..47820aa02e 100644 --- a/guix/build/gnu-build-system.scm +++ b/guix/build/gnu-build-system.scm @@ -109,9 +109,10 @@ makefiles." (base (basename out)) (dash (string-rindex base #\-))) ;; XXX: We'd rather use `package-name->name+version' or similar. - (if dash - (substring base 0 dash) - base))) + (string-drop (if dash + (substring base 0 dash) + base) + (+ 1 (string-index base #\-))))) (let* ((prefix (assoc-ref outputs "out")) (bindir (assoc-ref outputs "bin")) |