diff options
| author | Tobias Klauser <tklauser@distanz.ch> | 2013-07-29 10:23:48 +0200 |
|---|---|---|
| committer | Tobias Klauser <tklauser@distanz.ch> | 2013-07-29 10:23:48 +0200 |
| commit | e18e050dfb9a79241bc5169569ce28071353a8c1 (patch) | |
| tree | 592430e91a3bb42c40b1c388a025e4e4cbd045c9 | |
| parent | 4282deb33c39f2990cfd86c3970eecadc56d1abc (diff) | |
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 <tklauser@distanz.ch>
| -rw-r--r-- | Extra | 2 | ||||
| -rw-r--r-- | curvetun/Makefile | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -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} |