nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

build: Pass the right flags for "make distcheck". 

* Makefile.am (AM_DISTCHECK_CONFIGURE_FLAGS): New variable.
* configure.ac: Define and substitute `NIX_PREFIX'.
This commit is contained in:
Ludovic Courtès 2012-08-14 18:50:36 +02:00
parent d95c0113c9
commit 437e0729d8
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.am
View File

@ -95,3 +95,5 @@ $(guix_install_go_files): install-nobase_dist_guilemoduleDATA
SUBDIRS = po SUBDIRS = po
ACLOCAL_AMFLAGS = -I m4 ACLOCAL_AMFLAGS = -I m4
AM_DISTCHECK_CONFIGURE_FLAGS = \
--with-nixpkgs=$(NIXPKGS) --with-nix-prefix="$(NIX_PREFIX)"

6
configure.ac
View File

@ -27,7 +27,11 @@ AC_ARG_WITH([nix-prefix],
[AS_HELP_STRING([--with-nix-prefix=DIR], [search for Nix in DIR])], [AS_HELP_STRING([--with-nix-prefix=DIR], [search for Nix in DIR])],
[case "$withval" in [case "$withval" in
yes|no) ;; yes|no) ;;
*) PATH="$withval/bin:$PATH"; export PATH;; *)
NIX_PREFIX="$withval"
PATH="$NIX_PREFIX/bin:$PATH"; export PATH
AC_SUBST([NIX_PREFIX])
;;
esac], esac],
[]) [])