[elpa] externals/realgud 211c01a 014/140: Fix misfeatures in install-from-git.sh...

[Rocky Bernstein]

branch: externals/realgud
commit 211c01aa4758a295bbd849cc211656df02b4738c
Author: rocky <address@hidden>
Commit: rocky <address@hidden>

    Fix misfeatures in install-from-git.sh...
    
    Install .nosearch when install in from git. Fixes #187
    Docuement .nosearch in file
    Build code in /tmp
    realgud repo has changed: rocky/emacs-dbgr -> realgud/realgud
    
    command.el: use better org formatting
---
 install-from-git.sh              | 21 ++++++++++++---------
 realgud/.nosearch                | 11 +++++++++++
 realgud/Makefile.am              | 16 ++++++++++++++++
 realgud/common/buffer/command.el |  2 +-
 4 files changed, 40 insertions(+), 10 deletions(-)

diff --git a/install-from-git.sh b/install-from-git.sh
index 8f1291a..76d5c3c 100755
--- a/install-from-git.sh
+++ b/install-from-git.sh
@@ -47,6 +47,7 @@
 #   GIT_PROTOCOL='git' SUDO_CMD=' ' sh ./install-from-git.sh --prefix=/tmp
 
 GIT_PROTOCOL=${GIT_PROTOCOL:-https}
+MAKE=${MAKE:-make}
 
 # Run and echo a command
 run_cmd() {
@@ -79,24 +80,26 @@ fi
 
 for program in git make $try_cmd ; do
     if ! which $program >/dev/null 2>&1 ; then
-       echo "Can't find program $program in $PATH"
+       echo 2>&1 "Can't find program $program in $PATH"
        exit 1
     fi
 done
 
-for pkg in emacs-{test-simple,load-relative,loc-changes,dbgr} ; do
+cd /tmp
+for pkg in rocky/emacs-{test-simple,load-relative,loc-changes} realgud/realgud 
; do
     echo '******************************************'
     echo Trying to install ${pkg}...
     echo '******************************************'
-    if [[ -d $pkg ]]; then
-       run_cmd $need_sudo rm -fr $pkg
+    pkg_short=$(basename $pkg)
+    if [[ -d $pkg_short ]]; then
+       run_cmd $need_sudo rm -fr $pkg_short
     fi
-    run_cmd git clone ${GIT_PROTOCOL}://github.com/rocky/${pkg}.git
-    (cd $pkg && \
+    run_cmd git clone ${GIT_PROTOCOL}://github.com/${pkg}.git
+    (cd $pkg_short && \
         run_cmd $SHELL ./autogen.sh && \
        run_cmd ./configure $@ && \
-       run_cmd make && \
-       run_cmd make check && \
-        run_cmd $need_sudo make install
+       run_cmd ${MAKE} && \
+       run_cmd ${MAKE} check && \
+        run_cmd $need_sudo ${MAKE} install
     )
 done
diff --git a/realgud/.nosearch b/realgud/.nosearch
index e69de29..d9771c7 100644
--- a/realgud/.nosearch
+++ b/realgud/.nosearch
@@ -0,0 +1,11 @@
+The default install-from-git.sh can install realgud into a site-lisp,
+e.g /usr/local/share/emacs-site-lisp.
+
+site-lisp directories and their subdirectories may be automatically
+added to load path, in particular in Debian
+/usr/local/share/emacs/site-lisp/ is added to load-path before emacs
+system directories.  So realgud's common/buffer/info.el is loaded
+before emacs's info.el
+
+Adding this ".nosearch" file prevents emacs from adding realgud to the
+load-path.
diff --git a/realgud/Makefile.am b/realgud/Makefile.am
index 75a2af8..ad4daa8 100644
--- a/realgud/Makefile.am
+++ b/realgud/Makefile.am
@@ -1 +1,17 @@
+# Directories to run recursive makes
 SUBDIRS = common debugger lang
+
+# lispdir needs to get set here because it seems
+# to automatically use the parent root. Not sure
+# why that is since none of the other subdirectories have this
+# problem.
+lispdir = ${datarootdir}/emacs/site-lisp/realgud
+
+# My default this is based off of $lispdir, but that
+# is set funny, so we'll be explicit about lispdir_realgud
+# althoug in fact it isn't used.
+lispdir_realgud = ${datarootdir}/emacs/site-lisp/realgud
+
+# .nosearch isn't a lisp file, but we want it installed along with the
+# lisp files.
+lisp_LISP = .nosearch
diff --git a/realgud/common/buffer/command.el b/realgud/common/buffer/command.el
index 2ccdafd..8e0e66c 100644
--- a/realgud/common/buffer/command.el
+++ b/realgud/common/buffer/command.el
@@ -195,7 +195,7 @@
             (maphash
              (lambda (k v)
                (push (format
-                      "  - %s\t: %s" k (realgud:org-mode-encode v ""))
+                      "  - %s\t::\t%s" k (realgud:org-mode-encode v ""))
                      r))
              hash-table)
             r)