libbsd: Branch 'master' - 2 commits

[Guillem Jover]

 Makefile |   23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

New commits:
commit 42601170ace98fe62c1f63a4d1b820a0bacf3e1a
Author: Guillem Jover <guillem at hadrons.org>
Date:   Mon May 25 10:02:26 2009 +0200

    Change @libdir@ in the pkg-config file to be $(usrlibdir)
    
    The variable in the .pc file points to the directory where the .so
    symlink is present, which is never going to be something like /lib,
    but something like /usr/lib.

diff --git a/Makefile b/Makefile
index df8e4fe..53ab4f3 100644
--- a/Makefile
+++ b/Makefile
@@ -112,7 +112,7 @@ $(LIB_PKGCONFIG): $(LIB_PKGCONFIG).in
 	sed -e 's:@VERSION@:$(LIB_VERSION):' \
 	    -e 's:@prefix@:$(value prefix):' \
 	    -e 's:@exec_prefix@:$(value exec_prefix):' \
-	    -e 's:@libdir@:$(value libdir):' \
+	    -e 's:@libdir@:$(value usrlibdir):' \
 	    -e 's:@includedir@:$(value includedir):' \
 	    $< > $@
 
commit 0bd48c4a4d5382fd4d1e71b63b0d875637765dc1
Author: Guillem Jover <guillem at hadrons.org>
Date:   Mon May 25 09:57:14 2009 +0200

    Preserve the variables unexpanded in the pkg-config file

diff --git a/Makefile b/Makefile
index 6ba703b..df8e4fe 100644
--- a/Makefile
+++ b/Makefile
@@ -82,13 +82,13 @@ CFLAGS ?= -g -Wall -Wextra -Wno-unused-variable
 
 MK_CFLAGS := -Iinclude/ -include bsd/bsd.h -D_GNU_SOURCE -D__REENTRANT
 
-prefix		:= /usr
-exec_prefix	:=
-libdir		:= ${exec_prefix}/lib
-usrlibdir	:= ${prefix}/lib
-includedir	:= ${prefix}/include
-pkgconfigdir	:= ${usrlibdir}/pkgconfig
-mandir		:= ${prefix}/share/man
+prefix		= /usr
+exec_prefix	=
+libdir		= ${exec_prefix}/lib
+usrlibdir	= ${prefix}/lib
+includedir	= ${prefix}/include
+pkgconfigdir	= ${usrlibdir}/pkgconfig
+mandir		= ${prefix}/share/man
 
 .PHONY: libs
 libs: $(LIB_STATIC) $(LIB_SHARED_SO) $(LIB_PKGCONFIG)
@@ -108,13 +108,12 @@ man/md5.3bsd:  man/mdX.3
 src/hash/md5hl.c: src/hash/helper.c
 	sed -e 's:hashinc:bsd/md5.h:g' -e 's:HASH:MD5:g' $< > $@
 
-# FIXME: the variables should be preserved unexpanded in the .pc file
 $(LIB_PKGCONFIG): $(LIB_PKGCONFIG).in
 	sed -e 's:@VERSION@:$(LIB_VERSION):' \
-	    -e 's:@prefix@:$(prefix):' \
-	    -e 's:@exec_prefix@:$(exec_prefix):' \
-	    -e 's:@libdir@:$(libdir):' \
-	    -e 's:@includedir@:$(includedir):' \
+	    -e 's:@prefix@:$(value prefix):' \
+	    -e 's:@exec_prefix@:$(value exec_prefix):' \
+	    -e 's:@libdir@:$(value libdir):' \
+	    -e 's:@includedir@:$(value includedir):' \
 	    $< > $@
 
 $(LIB_STATIC): $(LIB_STATIC_OBJS)