From c6d639e3a337659a1790481f4de696459a11968a Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@hadrons.org>
Date: Thu, 7 Mar 2013 19:15:01 +0100
Subject: [PATCH 15/15] build: Unify and centralize plugindir default to be
 PKGLIBDIR/plugins
Status: obsolete

Unify its default value to be under PKGLIBDIR, instead of LIBDIR/near,
which does not match the name of the project nor the daemon. This also
fixes a discrepancy between the directory encoded in the daemon and
the pkg-config file. Centralize the variable to be only set in
configure.ac.
---
 Makefile.am  | 2 +-
 configure.ac | 5 ++++-
 neard.pc.in  | 6 +++---
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index b25c74b..2d3a4c1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -54,7 +54,7 @@ AM_CPPFLAGS = \
 
 CLEANFILES = src/builtin.h $(local_headers)
 
-plugindir = $(libdir)/near/plugins
+plugindir = @plugindir@
 
 configdir = ${sysconfdir}/neard
 
diff --git a/configure.ac b/configure.ac
index 9feb384..1c258bd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -14,7 +14,10 @@ if (test "${libdir}" = '${exec_prefix}/lib'); then
 	libdir='${prefix}/lib'
 fi
 
-plugindir="${libdir}/near/plugins"
+pkglibdir='${libdir}'"/${PACKAGE_TARNAME}"
+AC_SUBST(pkglibdir)
+plugindir='${pkglibdir}/plugins'
+AC_SUBST(plugindir)
 
 PKG_PROG_PKG_CONFIG
 
diff --git a/neard.pc.in b/neard.pc.in
index 3a46466..4b320bf 100644
--- a/neard.pc.in
+++ b/neard.pc.in
@@ -2,12 +2,12 @@ prefix=@prefix@
 exec_prefix=@exec_prefix@
 libdir=@libdir@
 includedir=@includedir@
- 
-plugindir=${libdir}/neard/plugins
+pkglibdir=@pkglibdir@
+plugindir=@plugindir@
 
 Name: neard
 Description: NFC daemon
 Requires: glib-2.0 dbus-1 libnl
 Version: @VERSION@
 Libs: -module -avoid-version -export-symbols-regex neard_plugin_desc
-Cflags: -I${includedir}
\ No newline at end of file
+Cflags: -I${includedir}
-- 
1.8.2.rc2