summaryrefslogtreecommitdiffstats
path: root/package/java
diff options
context:
space:
mode:
authorPeter Korsgaard <jacmet@sunsite.dk>2010-09-27 18:08:51 +0200
committerPeter Korsgaard <jacmet@sunsite.dk>2010-09-27 18:08:51 +0200
commite611747255055ad6f9409dffe7eefd233ac86964 (patch)
treebb7f18de995dcfd0b4a947b5c7e912ea6a5fc486 /package/java
parented6bdad8a6181d9d128252f1c7a6cb2cce81ab03 (diff)
parent478ea1a12dffca0025c0ad55ad702cbaec465f93 (diff)
downloadbuildroot-novena-e611747255055ad6f9409dffe7eefd233ac86964.tar.gz
buildroot-novena-e611747255055ad6f9409dffe7eefd233ac86964.zip
Merge branch 'for-2010.11/no-install-strip' of git://git.busybox.net/~tpetazzoni/git/buildroot
Diffstat (limited to 'package/java')
-rw-r--r--package/java/classpath/classpath.mk2
-rw-r--r--package/java/jamvm/jamvm.mk1
2 files changed, 0 insertions, 3 deletions
diff --git a/package/java/classpath/classpath.mk b/package/java/classpath/classpath.mk
index 979cc7451..338cf016b 100644
--- a/package/java/classpath/classpath.mk
+++ b/package/java/classpath/classpath.mk
@@ -9,8 +9,6 @@ CLASSPATH_SITE = $(BR2_GNU_MIRROR)/classpath
CLASSPATH_AUTORECONF = NO
CLASSPATH_INSTALL_STAGING = YES
CLASSPATH_INSTALL_TARGET = YES
-CLASSPATH_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) install
-CLASSPATH_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install
CLASSPATH_DIR_PREFIX = package/java
CLASSPATH_CONF_ENV = ac_cv_func_posix_getpwuid_r=yes glib_cv_stack_grows=no \
diff --git a/package/java/jamvm/jamvm.mk b/package/java/jamvm/jamvm.mk
index c7f7eac99..e7796bbc7 100644
--- a/package/java/jamvm/jamvm.mk
+++ b/package/java/jamvm/jamvm.mk
@@ -9,7 +9,6 @@ JAMVM_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/jam
JAMVM_AUTORECONF = NO
JAMVM_INSTALL_STAGING = YES
JAMVM_INSTALL_TARGET = YES
-JAMVM_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install
JAMVM_CONF_ENV = ac_cv_func_posix_getpwuid_r=yes glib_cv_stack_grows=no \
glib_cv_uscore=no ac_cv_func_strtod=yes \