From cd685410bd7d8f1893a9f585c784e43878e13913 Mon Sep 17 00:00:00 2001
From: Roy Marples <roy@marples.name>
Date: Fri, 11 Jan 2008 17:21:21 +0000
Subject: NetBSD doesn't include /lib in its link path, so we need to add it as
 an RPATH.

---
 mk/prog.mk    | 13 +++++++++++--
 mk/scripts.mk |  4 ++++
 2 files changed, 15 insertions(+), 2 deletions(-)

(limited to 'mk')

diff --git a/mk/prog.mk b/mk/prog.mk
index 7556250..c475427 100644
--- a/mk/prog.mk
+++ b/mk/prog.mk
@@ -5,13 +5,22 @@
 
 OBJS+=			${SRCS:.c=.o}
 
+include ${MK}/sys.mk
+# Some systems don't include /lib in their standard link path
+# so we should embed it if different
+_RPATH_SH=		if test "${SHLIBDIR}" != "/usr/${LIBNAME}"; then \
+				echo "-Wl,-rpath-link,${DESTDIR}${SHLIBDIR}:${DESTDIR}/usr/lib -R${SHLIBDIR}"; \
+			fi
+_RPATH!=		${_RPATH_SH}
+LDFLAGS+=		${_RPATH}$(shell ${_RPATH_SH})
+LDFLAGS+=		${PROGLDFLAGS}
+
 all: depend ${PROG}
 
 ${PROG}: ${SCRIPTS} ${OBJS}
-	${CC} ${CFLAGS} ${LDFLAGS} ${PROGLDFLAGS} -o $@ ${OBJS} ${LDADD}
+	${CC} ${CFLAGS} ${LDFLAGS} -o $@ ${OBJS} ${LDADD}
 
 clean:
 	rm -f ${OBJS} ${PROG} ${CLEANFILES}
 
-include ${MK}/sys.mk
 include ${MK}/depend.mk
diff --git a/mk/scripts.mk b/mk/scripts.mk
index ac231ce..35815b5 100644
--- a/mk/scripts.mk
+++ b/mk/scripts.mk
@@ -29,5 +29,9 @@ realinstall: ${BIN} ${CONF} ${CONF_APPEND}
 
 install: realinstall ${INSTALLAFTER}
 
+# A lot of scripts don't have anything to clean
+# Also, some rm implentation require a file argument regardless of error
+# so we ensure that it has a bogus argument
+CLEANFILES?=	.bogus
 clean:
 	rm -f ${OBJS} ${CLEANFILES}
-- 
cgit v1.2.3