From fd021fe05090ef84d5f6eb7200378f26d652a137 Mon Sep 17 00:00:00 2001 From: Daniel Borkmann Date: Tue, 27 Nov 2012 21:26:34 +0100 Subject: [PATCH] make: fix access to env vars Signed-off-by: Daniel Borkmann --- src/Makefile | 4 ++-- src/curvetun/nacl_path.sh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Makefile b/src/Makefile index 20d7589f..368a9044 100644 --- a/src/Makefile +++ b/src/Makefile @@ -165,8 +165,8 @@ $(foreach tool,$(TOOLS),$(eval $(call TOOL_templ,$(tool)))) netsniff-ng: ALL_CFLAGS += -I$(INCDIR)/libnl3/ -D__WITH_PROTOS trafgen: ALL_CFLAGS += -I.. -I$(INCDIR)/libnl3/ -D__WITH_PROTOS bpfc: ALL_CFLAGS += -I.. -curvetun: ALL_CFLAGS += -I$(NACL_INCLUDE_DIR) -curvetun: ALL_LDFLAGS += -L$(NACL_LIB_DIR) +curvetun: ALL_CFLAGS += -I$(shell echo $$NACL_INC_DIR) +curvetun: ALL_LDFLAGS += -L$(shell echo $$NACL_LIB_DIR) bpfc_clean_custom: $(Q)$(call RM,$(BUILD_DIR)/*.h $(BUILD_DIR)/*.c) diff --git a/src/curvetun/nacl_path.sh b/src/curvetun/nacl_path.sh index c8e1047f..9a511a7c 100755 --- a/src/curvetun/nacl_path.sh +++ b/src/curvetun/nacl_path.sh @@ -14,8 +14,8 @@ if test -z $nacl_include_path || test -z $nacl_lib_path; then exit 1 fi -export NACL_INCLUDE_DIR=$nacl_include_path +export NACL_INC_DIR=$nacl_include_path export NACL_LIB_DIR=$nacl_lib_path -echo "export NACL_INCLUDE_DIR=$nacl_include_path" >> ~/.bashrc +echo "export NACL_INC_DIR=$nacl_include_path" >> ~/.bashrc echo "export NACL_LIB_DIR=$nacl_lib_path" >> ~/.bashrc -- 2.11.4.GIT