From e18e050dfb9a79241bc5169569ce28071353a8c1 Mon Sep 17 00:00:00 2001 From: Tobias Klauser Date: Mon, 29 Jul 2013 10:23:48 +0200 Subject: build: Use NACL_{INC,LIB}_DIR set by configure The environment variables $NACL_INC_DIR/$NACL_LIB_DIR might not always be set, but the configure script will attempt to detect an existing NaCl installation if they aren't. Thus use the $CONFIG_NACL_INC_DIR/$CONFIG_NACL_LIB_DIR variables as emitted by the configure script for the build. Signed-off-by: Tobias Klauser --- Extra | 2 +- curvetun/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Extra b/Extra index 759b144..021e4f6 100644 --- a/Extra +++ b/Extra @@ -1,6 +1,6 @@ # Targets that need extra treatment for now -curvetun: LDFLAGS += -L ${NACL_LIB_DIR} +curvetun: LDFLAGS += -L ${CONFIG_NACL_LIB_DIR} mausezahn: CFLAGS = $(mausezahn-eflags) bpfc_clean_custom: diff --git a/curvetun/Makefile b/curvetun/Makefile index b13a0a0..93806b2 100644 --- a/curvetun/Makefile +++ b/curvetun/Makefile @@ -28,4 +28,4 @@ curvetun-objs = xmalloc.o \ curvetun_client.o \ curvetun.o -curvetun-eflags = -I ${NACL_INC_DIR} +curvetun-eflags = -I ${CONFIG_NACL_INC_DIR} -- cgit v1.2.3-54-g00ecf