Release libbsd 0.1.4

Fixes build failures on some non-Linux ports.

Based-on-patch-by: Petr Salinger <Petr.Salinger@seznam.cz>

Makefile

@@ -1,7 +1,7 @@
 LIB_NAME := libbsd
 LIB_VERSION_MAJOR := 0
 LIB_VERSION_MINOR := 1
-LIB_VERSION_MICRO := 3
+LIB_VERSION_MICRO := 4
 LIB_VERSION := $(LIB_VERSION_MAJOR).$(LIB_VERSION_MINOR).$(LIB_VERSION_MICRO)
 
 LIB_PKGCONFIG := $(LIB_NAME).pc
@@ -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
+prefix		= /usr
-exec_prefix	:=
+exec_prefix	=
-libdir		:= ${exec_prefix}/lib
+libdir		= ${exec_prefix}/lib
-usrlibdir	:= ${prefix}/lib
+usrlibdir	= ${prefix}/lib
-includedir	:= ${prefix}/include
+includedir	= ${prefix}/include
-pkgconfigdir	:= ${usrlibdir}/pkgconfig
+pkgconfigdir	= ${usrlibdir}/pkgconfig
-mandir		:= ${prefix}/share/man
+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:@prefix@:$(value prefix):' \
-	    -e 's:@exec_prefix@:$(exec_prefix):' \
+	    -e 's:@exec_prefix@:$(value exec_prefix):' \
-	    -e 's:@libdir@:$(libdir):' \
+	    -e 's:@libdir@:$(value usrlibdir):' \
-	    -e 's:@includedir@:$(includedir):' \
+	    -e 's:@includedir@:$(value includedir):' \
 	    $< > $@
 
 $(LIB_STATIC): $(LIB_STATIC_OBJS)
@@ -158,7 +157,13 @@ install: libs man
 	done
 	install -m644 $(LIB_MANS) $(DESTDIR)/$(mandir)/man3
 	install -m644 $(LIB_PKGCONFIG) $(DESTDIR)/$(pkgconfigdir)
+ifeq ($(libdir),$(usrlibdir))
+	# If both dirs are the same, do a relative symlink.
+	ln -sf $(LIB_SHARED) $(DESTDIR)/$(usrlibdir)/$(LIB_SHARED_SO)
+else
+	# Otherwise, do an absolute one.
 	ln -sf $(libdir)/$(LIB_SHARED) $(DESTDIR)/$(usrlibdir)/$(LIB_SHARED_SO)
+endif
 	ln -sf $(LIB_SHARED) $(DESTDIR)/$(libdir)/$(LIB_SONAME)
 
 .PHONY: clean

src/nlist.c

@@ -57,6 +57,9 @@ static char sccsid[] = "@(#)nlist.c	8.1 (Berkeley) 6/4/93";
 
 #ifdef _NLIST_DO_AOUT
 static int __aout_fdnlist(int, struct nlist *);
+#ifndef N_SYMSIZE
+#define N_SYMSIZE(a)	((a).a_syms)
+#endif
 #endif
 #ifdef _NLIST_DO_ELF
 static int __elf_fdnlist(int, struct nlist *);