From 64d79f0d5a30f121799a1bfb13d5c49da90b8b83 Mon Sep 17 00:00:00 2001
From: David Bremner <david@tethera.net>
Date: Fri, 17 Jul 2015 18:40:17 +0200
Subject: update load paths

dh-elpa.el needs to be loaded from the "never-byte-compiled" path, but
other packages might need to be loaded from the
"not-yet-byte-compiled" path"
---
 emacsen-common/install | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'emacsen-common/install')

diff --git a/emacsen-common/install b/emacsen-common/install
index cf93e7f..46c13e9 100644
--- a/emacsen-common/install
+++ b/emacsen-common/install
@@ -25,14 +25,13 @@ case $FLAVOR in
         echo install/${ELPA_PACKAGE}: Handling install of emacsen flavor ${FLAVOR}
 esac
 
-el_dir=/usr/share/emacs/site-lisp/elpa-src/${ELPA_PACKAGE}/
+src_dir=/usr/share/emacs/site-lisp/elpa-src
+el_dir=$src_dir/${ELPA_PACKAGE}/
 elc_dir=/usr/share/${FLAVOR}/site-lisp/elpa/${ELPA_PACKAGE}/
 
 export EMACSLOADPATH
 EMACSLOADPATH="/usr/share/emacs/site-lisp:"
 
-byte_compile_options="-Q -batch -l package -f package-initialize -f batch-byte-compile"
-
 echo install/${ELPA_PACKAGE}: byte-compiling for ${FLAVOR}
 
 [ -d ${elc_dir} ] || mkdir ${elc_dir}
@@ -45,7 +44,9 @@ echo install/${ELPA_PACKAGE}: byte-compiling for ${FLAVOR}
 # Byte compile them
 (cd ${elc_dir}
  set +e
- ${FLAVOR} ${byte_compile_options} *.el > Install.log 2>&1
+ ${FLAVOR} -Q -batch -l package \
+           --eval "(add-to-list 'package-directory-list \"$src_dir\")" \
+           -f package-initialize -f batch-byte-compile *.el > Install.log 2>&1
  if test $? -ne 0
  then
    cat Install.log
-- 
cgit v1.2.3