diff options
| author | Mathieu Lirzin <mthl@gnu.org> | 2017-01-23 02:38:31 +0100 |
|---|---|---|
| committer | Mathieu Lirzin <mthl@gnu.org> | 2017-01-24 20:11:55 +0100 |
| commit | 4ca0c93875b14fd82693bd4fd9ce2b3ecf2c6ed4 (patch) | |
| tree | 62cd46a66b19059a4ebaf2b72169647cb3a0bab6 | |
| parent | 19f8188d0ef537d5b0775864a86a75ede9d73299 (diff) | |
| download | cuirass-4ca0c93875b14fd82693bd4fd9ce2b3ecf2c6ed4.tar cuirass-4ca0c93875b14fd82693bd4fd9ce2b3ecf2c6ed4.tar.gz | |
build: Add '%aux-dir' variable.
* build-aux/guix.scm (%aux-dir): New variable. Use it.
| -rw-r--r-- | build-aux/guix.scm | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/build-aux/guix.scm b/build-aux/guix.scm index 7999d2f..d816713 100644 --- a/build-aux/guix.scm +++ b/build-aux/guix.scm @@ -35,13 +35,16 @@ "aclocal.m4" "bin/cuirass" "bin/evaluate" "config.cache" "guix.scm"))))) +(define %aux-dir + (current-source-directory)) + (define %srcdir - (or (current-source-directory) ".")) + (dirname %aux-dir)) (define (git-version-gen) ;; Return a string containing Cuirass version number. (let* ((cmd "git-version-gen .tarball-version") - (port (open-input-pipe (string-append %srcdir "/" cmd))) + (port (open-input-pipe (string-append %aux-dir "/" cmd))) (str (read-line port))) (close-pipe port) str)) @@ -52,7 +55,7 @@ (package (inherit (specification->package "cuirass")) (version (git-version-gen)) - (source (local-file (dirname %srcdir) #:recursive? #t + (source (local-file %srcdir #:recursive? #t #:select? keep-cuirass-file?)) (arguments '(#:phases |