[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master 6d2a92e 01/56: configure.ac: default lispdir relative to p
From: |
Rocky Bernstein |
Subject: |
[elpa] master 6d2a92e 01/56: configure.ac: default lispdir relative to prefix |
Date: |
Sat, 27 May 2017 05:02:27 -0400 (EDT) |
branch: master
commit 6d2a92e2ee505c42b56a66f85e593fd02f13ac38
Author: Alex Dunn <address@hidden>
Commit: Alex Dunn <address@hidden>
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
- [elpa] master updated (a2383c7 -> a6701db), Rocky Bernstein, 2017/05/27
- [elpa] master 6d2a92e 01/56: configure.ac: default lispdir relative to prefix,
Rocky Bernstein <=
- [elpa] master 8ee7a26 02/56: Merge pull request #145 from dunn/make_install, Rocky Bernstein, 2017/05/27
- [elpa] master 905216f 06/56: Bp tracking respects custom filename lookup ..., Rocky Bernstein, 2017/05/27
- [elpa] master 697daeb 13/56: Tidy code a little, Rocky Bernstein, 2017/05/27
- [elpa] master e62aed9 16/56: describe-variable links to cmd-buf non-nil value, Rocky Bernstein, 2017/05/27
- [elpa] master 1959804 10/56: Small docstring clarification, Rocky Bernstein, 2017/05/27
- [elpa] master 5faeb71 09/56: realgud:cmdbuf-buffers-describe shows field names, Rocky Bernstein, 2017/05/27
- [elpa] master 66abb81 14/56: Tidy code a little, Rocky Bernstein, 2017/05/27
- [elpa] master 2def5fc 20/56: Customizable "search for this (relative) bp file", Rocky Bernstein, 2017/05/27
- [elpa] master bbdeb4e 19/56: Fixes issue #33, Rocky Bernstein, 2017/05/27
- [elpa] master 7323aa7 04/56: Fix up "make dist", Rocky Bernstein, 2017/05/27