JDEE: Install bsh commands.

svn path=/nixpkgs/trunk/; revision=16402
This commit is contained in:
Ludovic Courtès 2009-07-16 15:21:15 +00:00
parent 10f6c2592c
commit 82c5ea7bc6
2 changed files with 16 additions and 5 deletions

View File

@ -34,14 +34,23 @@ in
build.bin.emacs = ${emacs}/bin/emacs
EOF
# Substitute variables, à la Autoconf.
for i in lisp/*.el
do
sed -i "$i" -e"s|@out@|$out|g"
sed -i "$i" -e "s|@out@|$out|g ;
s|@javadir@|$out/lib/java|g ;
s|@datadir@|$out/share/${name}|g"
done
'';
buildPhase = "ant dist";
installPhase = "ant install";
installPhase = ''
ant install
ensureDir "$out/share/${name}"
cp -rv java/bsh-commands "$out/share/${name}"
'';
buildInputs = [ emacs ant ];
propagatedBuildInputs = [ cedet ];

View File

@ -10,11 +10,13 @@ Tell the elisp code about the right Java directory.
- (concat
- (jde-find-jde-data-directory)
- "java/")))
+ (let* ((jde-java-directory "@out@/lib/java"))
(oset this bsh-cmd-dir (expand-file-name "bsh-commands" jde-java-directory))
-
- (oset this bsh-cmd-dir (expand-file-name "bsh-commands" jde-java-directory))
- (oset this checkstyle-jar (expand-file-name "lib/checkstyle-all.jar" jde-java-directory))
- (oset this regexp-jar (expand-file-name "lib/jakarta-regexp.jar" jde-java-directory))
+ (let ((jde-java-directory "@out@/lib/java"))
+
+ (oset this bsh-cmd-dir "@datadir@/bsh-commands")
+ (oset this checkstyle-jar (expand-file-name "checkstyle-all.jar" jde-java-directory))
+ (oset this regexp-jar (expand-file-name "jakarta-regexp.jar" jde-java-directory))
(oset this jde-classes-dir (expand-file-name "classes" jde-java-directory))