|
|
@@ -58,7 +58,6 @@ HADOOP_HOME ?= /usr/lib/hadoop
|
|
|
BLD_DIR := $(ROOT)/build
|
|
|
BLD_DIR_ENV := $(BLD_DIR)/env
|
|
|
BLD_DIR_BIN := $(BLD_DIR_ENV)/bin
|
|
|
-ENV_EASY_INSTALL := $(BLD_DIR_BIN)/easy_install
|
|
|
|
|
|
THIRDPARTY_DIR := $(ROOT)/ext/thirdparty
|
|
|
THIRDPARTY_JS_DIR := $(THIRDPARTY_DIR)/js
|
|
|
@@ -71,6 +70,15 @@ ASPECTJ_DIR := $(THIRDPARTY_DIR)/java/aspectj-1.6.5/
|
|
|
ENV_PYTHON := $(BLD_DIR_ENV)/bin/$(notdir $(SYS_PYTHON))
|
|
|
ENV_PYTHON_VERSION = $(shell $(ENV_PYTHON) -c 'import sys; print "python%d.%d"% sys.version_info[:2]')
|
|
|
|
|
|
+
|
|
|
+##############################
|
|
|
+# ENV_EASY_INSTALL uses the easy_install script installed in the virtual
|
|
|
+# environment. It must be called as an argument to ENV_PYTHON so the
|
|
|
+# problem of the shebang being truncated at 80 characters in most kernels
|
|
|
+# doesn't arise.
|
|
|
+##############################
|
|
|
+ENV_EASY_INSTALL := $(ENV_PYTHON) $(BLD_DIR_BIN)/easy_install
|
|
|
+
|
|
|
##############################
|
|
|
# This version is substituted through to the tarballs and packages.
|
|
|
##############################
|