diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2013-03-29 21:44:31 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2013-03-29 21:44:31 +0100 |
| commit | 4928e50033615e1d130dd84f131eff4cbc702ccf (patch) | |
| tree | 320ff9bae85de20b0293119653b07b1197eaaa82 /gnu/packages/patches/emacs-configure-sh.patch | |
| parent | 14a3a67364f46b24d7e39d64ac92879c3eb7f8eb (diff) | |
| parent | 3f5a932eeaa8111b841de64b742b1cc408f2419a (diff) | |
| download | guix-4928e50033615e1d130dd84f131eff4cbc702ccf.tar.gz | |
Merge branch 'master' into core-updates
Conflicts: Makefile.am gnu/packages/base.scm
Diffstat (limited to 'gnu/packages/patches/emacs-configure-sh.patch')
| -rw-r--r-- | gnu/packages/patches/emacs-configure-sh.patch | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/gnu/packages/patches/emacs-configure-sh.patch b/gnu/packages/patches/emacs-configure-sh.patch index fd34d06ced..6f5f3fe93a 100644 --- a/gnu/packages/patches/emacs-configure-sh.patch +++ b/gnu/packages/patches/emacs-configure-sh.patch @@ -1,14 +1,13 @@ Make sure the right shell is used when creating src/epaths.h. ---- emacs-24.2/configure 2013-01-13 17:01:53.000000000 +0100 -+++ emacs-24.2/configure 2013-01-13 17:01:57.000000000 +0100 -@@ -24135,7 +24135,7 @@ done +--- emacs-24.3/configure 2013-03-14 17:42:26.000000000 +0100 ++++ emacs-24.3/configure 2013-03-14 17:42:58.000000000 +0100 +@@ -26463,7 +26463,7 @@ done ;; "epaths":C) echo creating src/epaths.h --${MAKE-make} epaths-force -+${MAKE-make} epaths-force SHELL="$CONFIG_SHELL" +-${MAKE-make} MAKEFILE_NAME=do-not-make-Makefile epaths-force ++${MAKE-make} MAKEFILE_NAME=do-not-make-Makefile epaths-force SHELL="$CONFIG_SHELL" ;; "gdbinit":C) if test ! -f src/.gdbinit && test -f $srcdir/src/.gdbinit; then - |