comparison make/linux/makefiles/buildtree.make @ 233:17c572e2697c

6723762: Fix shell command that gets java version (uses 2>1) Reviewed-by: pbk
author ohair
date Tue, 08 Jul 2008 15:23:04 -0700
parents a294fd0c4b38
children b21425229e0b
comparison
equal deleted inserted replaced
231:72c3e8693c9a 233:17c572e2697c
333 $(QUIETLY) ( \ 333 $(QUIETLY) ( \
334 echo '#!/bin/sh'; \ 334 echo '#!/bin/sh'; \
335 $(BUILDTREE_COMMENT); \ 335 $(BUILDTREE_COMMENT); \
336 echo '. ./env.sh'; \ 336 echo '. ./env.sh'; \
337 echo "if [ -z \$$JAVA_HOME ]; then { $(NO_JAVA_HOME_MSG); exit 0; }; fi"; \ 337 echo "if [ -z \$$JAVA_HOME ]; then { $(NO_JAVA_HOME_MSG); exit 0; }; fi"; \
338 echo "if ! \$${JAVA_HOME}/bin/java $(JAVA_FLAG) -fullversion 2>1 > /dev/null"; \ 338 echo "if ! \$${JAVA_HOME}/bin/java $(JAVA_FLAG) -fullversion 2>&1 > /dev/null"; \
339 echo "then"; \ 339 echo "then"; \
340 echo " $(WRONG_DATA_MODE_MSG); exit 0;"; \ 340 echo " $(WRONG_DATA_MODE_MSG); exit 0;"; \
341 echo "fi"; \ 341 echo "fi"; \
342 echo 'CLASSPATH="$(GAMMADIR)/make/$(OS_FAMILY):$$CLASSPATH"'; \ 342 echo 'CLASSPATH="$(GAMMADIR)/make/$(OS_FAMILY):$$CLASSPATH"'; \
343 echo '[ -f gamma_g ] && { gamma=gamma_g; }'; \ 343 echo '[ -f gamma_g ] && { gamma=gamma_g; }'; \