[elpa] master 8ee7a26 02/56: Merge pull request #145 from dunn/make_install

[Rocky Bernstein]

branch: master
commit 8ee7a2624501ead2ce143b3709325e125c9f352d
Merge: 5f47b1f 6d2a92e
Author: R. Bernstein <ro...@users.noreply.github.com>
Commit: GitHub <nore...@github.com>

    Merge pull request #145 from dunn/make_install
    
    configure.ac: default lispdir relative to prefix
---
 compute-lispdir.sh | 46 ----------------------------------------------
 configure.ac       |  3 +--
 2 files changed, 1 insertion(+), 48 deletions(-)

diff --git a/compute-lispdir.sh b/compute-lispdir.sh
deleted file mode 100755
index 220befd..0000000
--- a/compute-lispdir.sh
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/bin/bash
-# Figures out a reasonable --prefix
-typeset -i rc=0
-typeset -i DEBUG=${DEBUG:-0}
-EMACS_PROG=${EMACS_PROG:-emacs}
-list=$($EMACS_PROG --batch --no-splash --no-site-file --eval '(message 
(substring (format "%s" load-path) 1 -1))' 2>&1)
-rc=$?
-if (( rc != 0 )) ; then
-    echo  >&2 "Something went wrong running $EMACS_PROG"
-    exit $rc
-$cmd
-fi
-for dir in $list ; do
-    if [[ -d $dir ]] ; then
-       case $dir in
-           */emacs/site-lisp)
-               ((DEBUG)) && echo "site lisp: $dir"
-               echo "$dir"
-               exit 0
-               ;;
-       esac
-    fi
-done
-for dir in $list ; do
-    if [[ -d $dir ]] ; then
-       case $dir in
-           */emacs/2[34]\.[0-9]/site-lisp)
-               ((DEBUG)) && echo "versioned site lisp: $dir"
-               echo "$dir"
-               exit 0
-               ;;
-       esac
-    fi
-done
-for dir in $list ; do
-    if [[ -d $dir ]] ; then
-       case $dir in
-           */emacs/2[34]\.[0-9]/site-lisp)
-               ((DEBUG)) && echo "versioned site lisp: $dir"
-               echo "$dir"
-               exit 0
-               ;;
-       esac
-    fi
-done
-exit 0
diff --git a/configure.ac b/configure.ac
index d9cc1c1..68e2cf9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -42,10 +42,9 @@ AM_MISSING_PROG(GIT2CL, git2cl, $missing_dir)
 # Check whether --with-lispdir was given.
 if test "${with_lispdir+set}" = set; then :
 else
-  my_lispdir=$(EMACS_PROG=$EMACS $SH_PROG $(dirname $0)/compute-lispdir.sh)
+  my_lispdir="${datadir}/emacs/site-lisp"
   if test "${my_lispdir+set}" = set; then :
     with_lispdir=$my_lispdir
-    echo "'compute-lispdir.sh' lispdir install directory override: 
'$with_lispdir'"
   fi
 fi