From c6eaaf9eb0b7f801d453945288fbef62f8f4af99 Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@hadrons.org>
Date: Thu, 7 Mar 2013 19:50:24 +0100
Subject: [PATCH v4 10/13] build: Do not expand libdir variable
Status: applied

Expanding the value when setting it causes uninitialized values to
trickle into generated files like neard.pc, which ends up with stuff
like libdir=NONE/lib.
---
 configure.ac | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 7a0e642..6292fc5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8,8 +8,10 @@ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 
 AM_MAINTAINER_MODE
 
+# Do not expand the default variables so that they can be changed at build
+# time, in the make command-line.
 if (test "${libdir}" = '${exec_prefix}/lib'); then
-	libdir="${prefix}/lib"
+	libdir='${prefix}/lib'
 fi
 
 PKG_PROG_PKG_CONFIG
-- 
2.1.1