diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2018-11-07 21:09:57 +0100 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2018-11-07 21:09:57 +0100 |
| commit | 55174e668f2985d1c4efda4fbf58f4061dde0db2 (patch) | |
| tree | f55f7e50fff1a1c3d1e6d2e932a7ef19347e5011 /Makefile.am | |
| parent | 1badc85068ee0be2a028c1b94a3dd285901bc391 (diff) | |
| parent | b31e1561611ebe4916890183b24e6e13cb83bf59 (diff) | |
| download | guix-55174e668f2985d1c4efda4fbf58f4061dde0db2.tar guix-55174e668f2985d1c4efda4fbf58f4061dde0db2.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am index 8c3df8f396..c63b65ba56 100644 --- a/Makefile.am +++ b/Makefile.am @@ -406,6 +406,7 @@ SH_TESTS = \ tests/guix-gc.sh \ tests/guix-hash.sh \ tests/guix-pack.sh \ + tests/guix-pack-relocatable.sh \ tests/guix-package.sh \ tests/guix-package-net.sh \ tests/guix-system.sh \ @@ -462,8 +463,8 @@ check-system: $(GOBJECTS) # Public key used to sign substitutes from hydra.gnu.org & co. dist_pkgdata_DATA = \ - hydra.gnu.org.pub \ - berlin.guixsd.org.pub + etc/substitutes/hydra.gnu.org.pub \ + etc/substitutes/berlin.guixsd.org.pub # Bash completion file. dist_bashcompletion_DATA = etc/completion/bash/guix \ |