From c7f0a388bd549af3b3042f994fa6123bab981a46 Mon Sep 17 00:00:00 2001
From: Pierre Pronchery <khorben@defora.org>
Date: Wed, 4 Jun 2008 20:07:26 +0000
Subject: [PATCH] The libdir value from project.conf has priority over the
 command line

---
 src/makefile.c | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/makefile.c b/src/makefile.c
index 8cca7f1..95ad702 100644
--- a/src/makefile.c
+++ b/src/makefile.c
@@ -467,16 +467,19 @@ static void _binary_ldflags(Configure * configure, FILE * fp,
 
 static void _variables_library(Configure * configure, FILE * fp, char * done)
 {
+	String const * libdir;
+
 	if(!done[TT_LIBRARY])
 	{
 		fprintf(fp, "%s%s\n", "PREFIX\t= ", configure->prefs->prefix);
 		fprintf(fp, "%s%s\n", "DESTDIR\t= ", configure->prefs->destdir);
 	}
-	if(configure->prefs->libdir[0] == '/')
-		fprintf(fp, "%s%s\n", "LIBDIR\t= ", configure->prefs->libdir);
+	if((libdir = config_get(configure->config, "", "libdir")) == NULL)
+		libdir = configure->prefs->libdir;
+	if(libdir[0] == '/')
+		fprintf(fp, "%s%s\n", "LIBDIR\t= ", libdir);
 	else
-		fprintf(fp, "%s%s\n", "LIBDIR\t= $(PREFIX)/",
-				configure->prefs->libdir);
+		fprintf(fp, "%s%s\n", "LIBDIR\t= $(PREFIX)/", libdir);
 	if(!done[TT_BINARY])
 	{
 		_targets_cflags(configure, fp);