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"

1 files changed, 5 insertions, 2 deletions

diff --git a/dh_elpa b/dh_elpa
index 617c6f5..2506dad 100755
--- a/dh_elpa
+++ b/dh_elpa
@@ -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);
 }