diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2013-05-27 09:41:44 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2013-06-03 12:17:13 +0200 |
| commit | 18191874631f176730323086c55d97bf6684fb69 (patch) | |
| tree | b248a1bd80af753831ae081dadcf1e3d97fc0bd6 /config | |
| parent | 0246f02b18da8f733f052b05b0ea35c64a3b5a1f (diff) | |
| download | ptxdist-18191874631f176730323086c55d97bf6684fb69.tar.gz ptxdist-18191874631f176730323086c55d97bf6684fb69.tar.xz | |
setup: don't use /usr as default jdk path
Using /usr will add /usr/include to the header search path.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'config')
| -rw-r--r-- | config/setup/Kconfig | 5 | ||||
| -rw-r--r-- | config/setup/ptxdistrc.default | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/config/setup/Kconfig b/config/setup/Kconfig index 40b974f9a..8d98697eb 100644 --- a/config/setup/Kconfig +++ b/config/setup/Kconfig @@ -225,12 +225,15 @@ menu "Java SDK " config SETUP_JAVA_SDK string - default "/usr" + default "/usr/lib/jvm/default-java" prompt "Java SDK" help Specify the path to your Java SDK; this is needed if Java programs are being compiled by PTXdist, for example if you have selected JVisu. + This must not be '/usr' but the actual SDK path, + e.g. '/usr/lib/jvm/default-java'. + Make sure the selected directory contains bin/javac. endmenu diff --git a/config/setup/ptxdistrc.default b/config/setup/ptxdistrc.default index 31b1575eb..69683e9c0 100644 --- a/config/setup/ptxdistrc.default +++ b/config/setup/ptxdistrc.default @@ -55,7 +55,7 @@ PTXCONF_SETUP_IPKG_REPOSITORY="/var/www/ipkg-repository" # # Java SDK # -PTXCONF_SETUP_JAVA_SDK="/usr" +PTXCONF_SETUP_JAVA_SDK="/usr/lib/jvm/default-java" # # Developer Options |