diff options
| -rwxr-xr-x | dh_elpa | 7 | ||||
| -rw-r--r-- | emacsen-common/install | 9 |
2 files changed, 10 insertions, 6 deletions
@@ -98,10 +98,12 @@ $dh{BYTECOMPILE} = 1 unless defined($dh{BYTECOMPILE}); my $elpadir; +my $dhelpadir="/usr/share/emacs/site-lisp/elpa"; + if ($dh{BYTECOMPILE}) { $elpadir="/usr/share/emacs/site-lisp/elpa-src"; } else { - $elpadir="/usr/share/emacs/site-lisp/elpa"; + $elpadir=$dhelpadir; } foreach my $package (@{$dh{DOPACKAGES}}) { @@ -164,7 +166,8 @@ foreach my $package (@{$dh{DOPACKAGES}}) { } doit_quietly(qw{emacs -batch -Q -l package}, - '--eval',"(add-to-list 'package-directory-list \"$elpadir\")", + '--eval',"(add-to-list 'package-directory-list \"$dhelpadir\")", + '--eval',"(add-to-list 'package-directory-list \"$elpadir\")", qw{-f package-initialize -l dh-elpa.el}, qw{-f dhelpa-batch-install-file}, "$tmp/$elpadir", $pkg_file); } 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 |