JDEE: Don't install non-JAR files under `lib/java'.

svn path=/nixpkgs/trunk/; revision=16403

pkgs/applications/editors/emacs-modes/jdee/default.nix

@@ -50,6 +50,17 @@ in
 
       ensureDir "$out/share/${name}"
       cp -rv java/bsh-commands "$out/share/${name}"
+
+      # Move everything that's not a JAR to $datadir.  This includes
+      # `sun_checks.xml', license files, etc.
+      cd "$out/lib/java"
+      for i in *
+      do
+        if echo $i | grep -qv '\.jar''$'
+        then
+            mv -v "$i" "$out/share/${name}"
+        fi
+      done
     '';
 
     buildInputs = [ emacs ant ];

pkgs/applications/editors/emacs-modes/jdee/java-directory.patch

@@ -53,7 +53,7 @@ Tell the elisp code about the right Java directory.
  		      (if jde-checkstyle-style
  			  (jde-normalize-path jde-checkstyle-style)
 -			(concat (jde-find-jde-data-directory) "java/lib/sun_checks.xml")))
-+			"@out@/lib/java/sun_checks.xml"))
++			"@datadir@/sun_checks.xml"))
  		(if jde-checkstyle-expanded-properties-file
                      (list "-p" (jde-normalize-path jde-checkstyle-expanded-properties-file)))
  		(if jde-checkstyle-module-package-names-file