From 0ccf307ed807cb057e9c3865a89a122842eb2cc3 Mon Sep 17 00:00:00 2001
From: Pierre Pronchery <khorben@defora.org>
Date: Wed, 27 Nov 2013 21:00:39 +0100
Subject: [PATCH] Using $(LIBDIR) instead of $(PREFIX)/lib in Makefiles

---
 src/Makefile             | 4 ++--
 src/plugins/Makefile     | 2 +-
 src/plugins/project.conf | 2 +-
 src/project.conf         | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/Makefile b/src/Makefile
index 5930e2e..a49a66a 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -41,14 +41,14 @@ libMailer.so.0.0 libMailer.so.0 libMailer.so: $(libMailer_OBJS)
 
 compose_OBJS = compose-main.o
 compose_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(CFLAGSF) $(CFLAGS)
-compose_LDFLAGS = $(LDFLAGSF) $(LDFLAGS) `pkg-config --libs openssl` -lssl -L. -Wl,-rpath,$(PREFIX)/lib -lMailer
+compose_LDFLAGS = $(LDFLAGSF) $(LDFLAGS) `pkg-config --libs openssl` -lssl -L. -Wl,-rpath,$(LIBDIR) -lMailer
 
 compose: $(compose_OBJS) libMailer.a
 	$(CC) -o compose $(compose_OBJS) $(compose_LDFLAGS)
 
 mailer_OBJS = main.o
 mailer_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(CFLAGSF) $(CFLAGS)
-mailer_LDFLAGS = $(LDFLAGSF) $(LDFLAGS) `pkg-config --libs openssl` -lssl -L. -Wl,-rpath,$(PREFIX)/lib -lMailer
+mailer_LDFLAGS = $(LDFLAGSF) $(LDFLAGS) `pkg-config --libs openssl` -lssl -L. -Wl,-rpath,$(LIBDIR) -lMailer
 
 mailer: $(mailer_OBJS) libMailer.a
 	$(CC) -o mailer $(mailer_OBJS) $(mailer_LDFLAGS)
diff --git a/src/plugins/Makefile b/src/plugins/Makefile
index 11d40aa..191839b 100644
--- a/src/plugins/Makefile
+++ b/src/plugins/Makefile
@@ -21,7 +21,7 @@ all: $(TARGETS)
 
 mailing-lists_OBJS = mailing-lists.o
 mailing-lists_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(CFLAGSF) $(CFLAGS)
-mailing-lists_LDFLAGS = $(LDFLAGSF) $(LDFLAGS) -L.. -Wl,-rpath,$(PREFIX)/lib -lMailer
+mailing-lists_LDFLAGS = $(LDFLAGSF) $(LDFLAGS) -L.. -Wl,-rpath,$(LIBDIR) -lMailer
 
 mailing-lists.so: $(mailing-lists_OBJS)
 	$(CCSHARED) -o mailing-lists.so $(mailing-lists_OBJS) $(mailing-lists_LDFLAGS)
diff --git a/src/plugins/project.conf b/src/plugins/project.conf
index 31354ae..d886f27 100644
--- a/src/plugins/project.conf
+++ b/src/plugins/project.conf
@@ -8,7 +8,7 @@ dist=Makefile
 [mailing-lists]
 type=plugin
 sources=mailing-lists.c
-ldflags=-L.. -Wl,-rpath,$(PREFIX)/lib -lMailer
+ldflags=-L.. -Wl,-rpath,$(LIBDIR) -lMailer
 install=$(LIBDIR)/Mailer/plugins
 
 [mailing-lists.c]
diff --git a/src/project.conf b/src/project.conf
index 956816c..c1699f7 100644
--- a/src/project.conf
+++ b/src/project.conf
@@ -19,7 +19,7 @@ type=binary
 #XXX may be statically linked to libMailer (if built before libMailer.so)
 depends=libMailer.a
 sources=compose-main.c
-ldflags=`pkg-config --libs openssl` -lssl -L. -Wl,-rpath,$(PREFIX)/lib -lMailer
+ldflags=`pkg-config --libs openssl` -lssl -L. -Wl,-rpath,$(LIBDIR) -lMailer
 install=$(BINDIR)
 
 [mailer]
@@ -27,7 +27,7 @@ type=binary
 #XXX may be statically linked to libMailer (if built before libMailer.so)
 depends=libMailer.a
 sources=main.c
-ldflags=`pkg-config --libs openssl` -lssl -L. -Wl,-rpath,$(PREFIX)/lib -lMailer
+ldflags=`pkg-config --libs openssl` -lssl -L. -Wl,-rpath,$(LIBDIR) -lMailer
 install=$(BINDIR)
 
 [account.c]