diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2012-10-17 22:51:08 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2012-10-17 23:25:25 +0200 |
| commit | 7da95264f196d1c5dfa01654e87a319bce458cc1 (patch) | |
| tree | ab9eaeb03784986b18e28fa60898c32dd7342862 /distro/packages | |
| parent | 7172116ca5178d3bd1ff7590aca50033c57e8ea1 (diff) | |
| download | patches-7da95264f196d1c5dfa01654e87a319bce458cc1.tar patches-7da95264f196d1c5dfa01654e87a319bce458cc1.tar.gz | |
utils: Add `mkdir-p'; use it.
* guix/build/utils.scm (mkdir-p): New procedure.
* distro/packages/base.scm (gnu-make-boot0, gcc-boot0-wrapped,
ld-wrapper-boot3, %static-binaries, %guile-static-stripped): Use it.
* distro/packages/typesetting.scm (lout): Likewise.
Diffstat (limited to 'distro/packages')
| -rw-r--r-- | distro/packages/base.scm | 19 | ||||
| -rw-r--r-- | distro/packages/typesetting.scm | 6 |
2 files changed, 8 insertions, 17 deletions
diff --git a/distro/packages/base.scm b/distro/packages/base.scm index 3a22b65f13..7fb26881e2 100644 --- a/distro/packages/base.scm +++ b/distro/packages/base.scm @@ -1481,8 +1481,7 @@ previous value of the keyword argument." 'install (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) (bin (string-append out "/bin"))) - (mkdir out) - (mkdir bin) + (mkdir-p bin) (copy-file "make" (string-append bin "/make")))) %standard-phases)))) @@ -1709,7 +1708,7 @@ identifier SYSTEM." (out (assoc-ref %outputs "out")) (bindir (string-append out "/bin")) (triplet ,(boot-triplet system))) - (mkdir out) (mkdir bindir) + (mkdir-p bindir) (with-directory-excursion bindir (for-each (lambda (tool) (symlink (string-append binutils "/bin/" @@ -1807,7 +1806,7 @@ exec ~a/bin/~a-gcc -B~a/lib -Wl,-dynamic-linker -Wl,~a/lib/~a \"$@\"~%" (assoc-ref %build-inputs "binutils") out) - (mkdir out) (mkdir bin) + (mkdir-p bin) (copy-file (assoc-ref %build-inputs "wrapper") ld) (substitute* ld (("@GUILE@") @@ -2020,7 +2019,7 @@ store.") (let* ((out (assoc-ref %outputs "out")) (bin (string-append out "/bin"))) - (mkdir out) (mkdir bin) + (mkdir-p bin) ;; Copy Coreutils binaries. (let* ((coreutils (assoc-ref %build-inputs "coreutils")) @@ -2127,17 +2126,11 @@ store.") (let ((in (assoc-ref %build-inputs "guile")) (out (assoc-ref %outputs "out"))) - (mkdir out) - (mkdir (string-append out "/share")) - (mkdir (string-append out "/share/guile")) - (mkdir (string-append out "/share/guile/2.0")) + (mkdir-p (string-append out "/share/guile/2.0")) (copy-recursively (string-append in "/share/guile/2.0") (string-append out "/share/guile/2.0")) - (mkdir (string-append out "/lib")) - (mkdir (string-append out "/lib/guile")) - (mkdir (string-append out "/lib/guile/2.0")) - (mkdir (string-append out "/lib/guile/2.0/ccache")) + (mkdir-p (string-append out "/lib/guile/2.0/ccache")) (copy-recursively (string-append in "/lib/guile/2.0/ccache") (string-append out "/lib/guile/2.0/ccache")) diff --git a/distro/packages/typesetting.scm b/distro/packages/typesetting.scm index cd0eae1187..5ca33c628a 100644 --- a/distro/packages/typesetting.scm +++ b/distro/packages/typesetting.scm @@ -46,12 +46,10 @@ (("^MANDIR[[:blank:]]*=.*$") (string-append "MANDIR = " out "/man\n"))) (mkdir out) - (mkdir (string-append out "/bin")) ; TODO: use `mkdir-p' + (mkdir (string-append out "/bin")) (mkdir (string-append out "/lib")) (mkdir (string-append out "/man")) - (mkdir doc) - (mkdir (string-append doc "/doc")) - (mkdir (string-append doc "/doc/lout"))))) + (mkdir-p (string-append doc "/doc/lout"))))) (install-man-phase '(lambda* (#:key outputs #:allow-other-keys) (zero? (system* "make" "installman")))) |