From cc520a6b2d40f0d31508e36fb8d59743fcfaebf4 Mon Sep 17 00:00:00 2001
From: Paul Giblock <drfaygo@gmail.com>
Date: Sun, 29 Jun 2008 11:53:14 +0000
Subject: [PATCH] Fix LIBDIR for non-prefix users

git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@1208 0778d3d1-df1d-0410-868b-ea421aaaa00d
---
 ChangeLog    | 3 +++
 configure.in | 6 +++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 869150b18..9d117d400 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -46,6 +46,9 @@
 	* src/tracks/automation_track.cpp:
 	Allow dragging automatable views directly onto an automation-track
 
+	* configure.in:
+	Fix LIBDIR for when people do not use --prefix
+
 2008-06-28	Tobias Doerffel	<tobydox/at/users/dot/sourceforge/dot/net>
 
 	* plugins/Makefile.am:
diff --git a/configure.in b/configure.in
index 0aaf2cac2..54f9a77d2 100644
--- a/configure.in
+++ b/configure.in
@@ -18,10 +18,14 @@ AM_PROG_LIBTOOL
 
 if ! test -z "${prefix}" -o "${prefix}" = "NONE" ; then
 	CFLAGS="$CFLAGS -I${prefix}/include"
-	CPPFLAGS="$CPPFLAGS -I${prefix}/include -DLIBDIR='\"${libdir}\"'"
+	CPPFLAGS="$CPPFLAGS -I${prefix}/include"
 	LDFLAGS="$LDFLAGS -L${prefix}/bin"
 fi
 
+if ! test -z "${libdir}" ; then
+	CPPFLAGS="$CPPFLAGS -DLIBDIR='\"${libdir}\"'"
+fi
+
 AH_TEMPLATE(BUILD_LINUX, [Build LMMS for Linux])
 AH_TEMPLATE(BUILD_WIN32, [Build LMMS for Win32])
 AH_TEMPLATE(WIN32, [Build LMMS for Win32])