summary refs log tree commit diff
path: root/Makefile.am
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2012-12-04 23:51:31 +0100
committerLudovic Courtès <ludo@gnu.org>2012-12-04 23:51:31 +0100
commit5f25049e9c2002eb808d2f15306d0ac102f05415 (patch)
treea587cff1c805c20f45fd7e7f235d60c6d1ab7ac7 /Makefile.am
parentb49ffe2d678b5df4192fb9be4ad50bed9d6d5b7f (diff)
parentc7bdb1b9d1c0071e9a61a7bbdb8051a9b1620822 (diff)
downloadguix-5f25049e9c2002eb808d2f15306d0ac102f05415.tar.gz
Merge branch 'master' into nix-integration
Diffstat (limited to 'Makefile.am')
-rw-r--r--Makefile.am4
1 files changed, 4 insertions, 0 deletions
diff --git a/Makefile.am b/Makefile.am
index 147ba1949e..101ac1dfdb 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -67,6 +67,7 @@ MODULES =					\
   distro/packages/libunistring.scm		\
   distro/packages/linux.scm			\
   distro/packages/lout.scm			\
+  distro/packages/lsh.scm			\
   distro/packages/m4.scm			\
   distro/packages/make-bootstrap.scm		\
   distro/packages/multiprecision.scm		\
@@ -103,6 +104,9 @@ dist_patch_DATA =						\
   distro/packages/patches/guile-default-utf8.patch		\
   distro/packages/patches/guile-relocatable.patch		\
   distro/packages/patches/libtool-skip-tests.patch		\
+  distro/packages/patches/lsh-guile-compat.patch		\
+  distro/packages/patches/lsh-no-root-login.patch		\
+  distro/packages/patches/lsh-pam-service-name.patch		\
   distro/packages/patches/m4-gets-undeclared.patch		\
   distro/packages/patches/m4-readlink-EINVAL.patch		\
   distro/packages/patches/m4-s_isdir.patch			\