Use -rpath consistently

build/lib-shared.mk

@@ -14,8 +14,8 @@ NT_DYN_LT_NO_UNDEF = -no-undefined
 LT_NO_UNDEF = $(@PLAT@_@LIB_LINKAGE@_LT_NO_UNDEF)
 
 COMPILE = $(LIBTOOL) $(LTFLAGS) --mode=compile $(CC) $(CFLAGS) $(EXTRA_DEFS) -c
-LTLIBLINK = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) \
-		$(LTVERSION) $(LT_NO_UNDEF)
+LTLIBLINK = $(LIBTOOL) $(LTFLAGS) --mode=link -rpath $(libdir) \
+	$(CC) $(CFLAGS) $(LDFLAGS) $(LTVERSION) $(LT_NO_UNDEF)
 
 MKDEPFLAG = -l
 
@@ -31,7 +31,7 @@ MKDEPFLAG = -l
 DYN_EXT=@DYN_EXT@
 
 $(LIBRARY):  version.lo
-	$(LTLIBLINK) -rpath $(libdir) -o $@ $(OBJS) version.lo $(EXTRA_LIBS)
+	$(LTLIBLINK) -o $@ $(OBJS) version.lo $(EXTRA_LIBS)
 	$(RM) ../$@
 	d=`$(PWD)`; d=`$(BASENAME) $$d`; cd ..; $(LN_S) $$d/$@ $@; \
 	t=`$(BASENAME) $@ .la`.a; $(RM) $$t; $(LN_S) $$d/.libs/$$t $$t

build/mod.mk

@@ -13,8 +13,8 @@ LIBSTAT = lib$(LIBBASE).a
 LTFLAGS = --only-$(LINKAGE)
 
 COMPILE = $(LIBTOOL) $(LTFLAGS) --mode=compile $(CC) $(CFLAGS) $(MODDEFS) -c
-LTLIBLINK = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) \
-		$(LTVERSION) $(LT_NO_UNDEF)
+LTLIBLINK = $(LIBTOOL) $(LTFLAGS) --mode=link -rpath $(moduledir) \
+	$(CC) $(CFLAGS) $(LDFLAGS) $(LTVERSION) $(LT_NO_UNDEF)
 
 MKDEPFLAG = -l
 
@@ -33,7 +33,7 @@ version.c: $(OBJS)
 	$(MKVERSION) $(LIBBASE) > $@
 
 $(LIBRARY): $(MODDEPS) version.lo
-	$(LTLIBLINK) -module -rpath $(moduledir) -o $@ $(OBJS) version.lo \
+	$(LTLIBLINK) -module -o $@ $(OBJS) version.lo \
 	    $(MODLIBS)
 
 $(LIBSTAT): version.lo

build/top.mk

@@ -57,7 +57,8 @@ MKVERSION = $(top_srcdir)/build/mkversion -v "$(VERSION)"
 LIBTOOL = @LIBTOOL@
 LIBVERSION = @OPENLDAP_LIBVERSION@
 LTVERSION = -version-info $(LIBVERSION)
-LTLINK  = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS)
+LTLINK  = $(LIBTOOL) --mode=link -rpath $(libdir) \
+	$(CC) $(CFLAGS) $(LDFLAGS)
 LTINSTALL = $(LIBTOOL) --mode=install $(INSTALL) 
 
 # Misc UNIX commands used in build environment