Re: (ITS#7885) [PATCH] wrong RPATH in contrib/passwd/Makefile

[hyc@symas.com]

ryan@nardis.ca wrote:
> Full_Name: Ryan Tandy
> Version: master
> OS: Debian unstable
> URL:
> Submission from: (NULL) (24.68.121.206)
>
>
> Similar to #7858, another easy patch.

Thanks, committed to master.
>
>
>>From 3047469eb717018e5b292352626cd084477faf12 Mon Sep 17 00:00:00 2001
> From: Ryan Tandy <ryan@nardis.ca>
> Date: Fri, 27 Jun 2014 11:15:26 -0700
> Subject: [PATCH] fix contrib/passwd RPATH
>
> ---
>   contrib/slapd-modules/passwd/Makefile | 8 ++++----
>   1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/contrib/slapd-modules/passwd/Makefile
> b/contrib/slapd-modules/passwd/Makefile
> index ba41304..c240366 100644
> --- a/contrib/slapd-modules/passwd/Makefile
> +++ b/contrib/slapd-modules/passwd/Makefile
> @@ -33,19 +33,19 @@ all: $(PROGRAMS)
>
>   pw-kerberos.la:	kerberos.lo
>   	$(LIBTOOL) --mode=link $(CC) $(OPT) -version-info $(LTVER) \
> -	-rpath $(PREFIX)/lib -module -o $@ $? -lkrb5
> +	-rpath $(moduledir) -module -o $@ $? -lkrb5
>
>   pw-netscape.la:	netscape.lo
>   	$(LIBTOOL) --mode=link $(CC) $(OPT) -version-info $(LTVER) \
> -	-rpath $(PREFIX)/lib -module -o $@ $?
> +	-rpath $(moduledir) -module -o $@ $?
>
>   pw-radius.la:	radius.lo
>   	$(LIBTOOL) --mode=link $(CC) $(OPT) -version-info $(LTVER) \
> -	-rpath $(PREFIX)/lib -module -o $@ $? -lradius
> +	-rpath $(moduledir) -module -o $@ $? -lradius
>
>   pw-apr1.la:	apr1.lo
>   	$(LIBTOOL) --mode=link $(CC) $(OPT) -version-info $(LTVER) \
> -	-rpath $(PREFIX)/lib -module -o $@ $?
> +	-rpath $(moduledir) -module -o $@ $?
>
>   clean:
>   	rm -rf *.o *.lo *.la .libs
>


-- 
   -- Howard Chu
   CTO, Symas Corp.           http://www.symas.com
   Director, Highland Sun     http://highlandsun.com/hyc/
   Chief Architect, OpenLDAP  http://www.openldap.org/project/