diff options
| author | Mark H Weaver <mhw@netris.org> | 2015-04-17 09:54:11 -0400 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2015-04-17 09:54:11 -0400 |
| commit | 933204e5b1473a54367aef1f90de22424e9074ab (patch) | |
| tree | d0ccfee2b903c5fac827bc4a52ec7de17bdc1e7b /Makefile.am | |
| parent | 9128e323c0a23243c3f70b1716c68ad0b241f30d (diff) | |
| parent | 5e25ebe2fa70297d094fe891b81c4970e45a906a (diff) | |
| download | guix-933204e5b1473a54367aef1f90de22424e9074ab.tar guix-933204e5b1473a54367aef1f90de22424e9074ab.tar.gz | |
Merge branch 'master' into core-updates
Conflicts:
gnu-system.am
gnu/packages/gstreamer.scm
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/Makefile.am b/Makefile.am index c1fa5332be..aa412bda2b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -258,6 +258,7 @@ EXTRA_DIST = \ build-aux/check-final-inputs-self-contained.scm \ build-aux/download.scm \ build-aux/list-packages.scm \ + build-aux/make-binary-tarball.scm \ srfi/srfi-37.scm.in \ srfi/srfi-64.scm \ srfi/srfi-64.upstream.scm \ @@ -343,6 +344,13 @@ dist_emacsui_DATA = emacs/guix-main.scm nodist_emacsui_DATA = emacs/guix-helper.scm include emacs.am +# The self-contained tarball. +guix-binary.%.tar.xz: + -GUIX_PACKAGE_PATH= \ + $(top_builddir)/pre-inst-env "$(GUILE)" \ + "$(top_srcdir)/build-aux/make-binary-tarball.scm" "$*" "$@" + + dist-hook: sync-descriptions gen-ChangeLog assert-no-store-file-names distcheck-hook: assert-binaries-available assert-final-inputs-self-contained |