summaryrefslogtreecommitdiffstats
path: root/package/java
diff options
context:
space:
mode:
Diffstat (limited to 'package/java')
-rw-r--r--package/java/classpath/classpath.mk12
-rw-r--r--package/java/concierge/concierge.mk2
-rw-r--r--package/java/jamvm/Config.in4
-rw-r--r--package/java/jamvm/jamvm.mk2
4 files changed, 10 insertions, 10 deletions
diff --git a/package/java/classpath/classpath.mk b/package/java/classpath/classpath.mk
index 0e0eaa3da..ace57ddf9 100644
--- a/package/java/classpath/classpath.mk
+++ b/package/java/classpath/classpath.mk
@@ -9,7 +9,7 @@ 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_STAGING_OPT = DESTDIR=$(STAGING_DIR) install
CLASSPATH_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install
CLASSPATH_DIR_PREFIX = package/java
@@ -42,7 +42,7 @@ CLASSPATH_CONF_ENV = ac_cv_func_posix_getpwuid_r=yes glib_cv_stack_grows=no \
ac_cv_func_working_mktime=yes jm_cv_func_working_re_compile_pattern=yes \
ac_use_included_regex=no gl_cv_c_restrict=no \
ac_cv_path_GLIB_GENMARSHAL=/usr/bin/glib-genmarshal \
- ac_cv_prog_F77=no ac_cv_prog_CXX=no ac_cv_path_CUPS_CONFIG=no
+ ac_cv_prog_F77=no ac_cv_prog_CXX=no ac_cv_path_CUPS_CONFIG=no
CLASSPATH_CONF_OPT = --target=$(GNU_TARGET_NAME) --host=$(GNU_TARGET_NAME) \
@@ -63,21 +63,21 @@ CLASSPATH_DEPENDENCIES = uclibc pkgconfig png jpeg tiff
ifeq ($(BR2_PACKAGE_ALSA_LIB),y)
CLASSPATH_DEPENDENCIES+= alsa-lib
CLASSPATH_CONF_OPT+= --enable-alsa
-else
+else
CLASSPATH_CONF_OPT+= --disable-alsa
endif
ifeq ($(BR2_PACKAGE_QTOPIA4),y)
CLASSPATH_DEPENDENCIES+= qtopia4
CLASSPATH_CONF_OPT+= --enable-qt-peer
-else
+else
CLASSPATH_CONF_OPT+= --disable-qt-peer
endif
ifeq ($(BR2_PACKAGE_LIBGTK2),y)
CLASSPATH_DEPENDENCIES+= libgtk2
CLASSPATH_CONF_OPT+= --enable-gtk-peer
-else
+else
CLASSPATH_CONF_OPT+= --disable-gtk-peer
endif
@@ -87,7 +87,7 @@ ifneq ($(BR2_PACKAGE_XSERVER_none),y)
--x-includes=$(STAGING_DIR)/usr/include/X11 \
--x-libraries=$(STAGING_DIR)/usr/lib
else
- CLASSPATH_CONF_OPT+= --without-x
+ CLASSPATH_CONF_OPT+= --without-x
endif
diff --git a/package/java/concierge/concierge.mk b/package/java/concierge/concierge.mk
index 68ca4165d..e080b2031 100644
--- a/package/java/concierge/concierge.mk
+++ b/package/java/concierge/concierge.mk
@@ -23,7 +23,7 @@ $(TARGET_DIR)/usr/lib/concierge/: $(DL_DIR)/concierge
cp -dpf package/concierge/files/init.xargs $(TARGET_DIR)/usr/lib/concierge/
touch -c $@
-$(TARGET_DIR)/usr/bin/concierge:
+$(TARGET_DIR)/usr/bin/concierge:
cp -dpf package/concierge/files/concierge $(TARGET_DIR)/usr/bin/
chmod +x $(TARGET_DIR)/usr/bin/concierge
touch -c $@
diff --git a/package/java/jamvm/Config.in b/package/java/jamvm/Config.in
index 660b8f84e..6e166dc42 100644
--- a/package/java/jamvm/Config.in
+++ b/package/java/jamvm/Config.in
@@ -3,7 +3,7 @@ config BR2_PACKAGE_JAMVM
depends on BR2_PACKAGE_CLASSPATH
select BR2_PACKAGE_PKGCONFIG
help
- JamVM is a new Java Virtual Machine which conforms to
- the JVM specification version 2 (blue book).
+ JamVM is a new Java Virtual Machine which conforms to
+ the JVM specification version 2 (blue book).
http://jamvm.sourceforge.net/
diff --git a/package/java/jamvm/jamvm.mk b/package/java/jamvm/jamvm.mk
index 951d091d8..c79c31d89 100644
--- a/package/java/jamvm/jamvm.mk
+++ b/package/java/jamvm/jamvm.mk
@@ -41,7 +41,7 @@ JAMVM_CONF_ENV = ac_cv_func_posix_getpwuid_r=yes glib_cv_stack_grows=no \
ac_cv_func_working_mktime=yes jm_cv_func_working_re_compile_pattern=yes \
ac_use_included_regex=no gl_cv_c_restrict=no \
ac_cv_path_GLIB_GENMARSHAL=/usr/bin/glib-genmarshal \
- ac_cv_prog_F77=no ac_cv_prog_CXX=no ac_cv_path_CUPS_CONFIG=no
+ ac_cv_prog_F77=no ac_cv_prog_CXX=no ac_cv_path_CUPS_CONFIG=no
JAMVM_CONF_OPT = --target=$(GNU_TARGET_NAME) --host=$(GNU_TARGET_NAME) \
--build=$(GNU_HOST_NAME) --prefix=/usr \