diff --git a/contrib/slapd-modules/acl/Makefile b/contrib/slapd-modules/acl/Makefile index 40a8e9ecca..89b70fb0ad 100644 --- a/contrib/slapd-modules/acl/Makefile +++ b/contrib/slapd-modules/acl/Makefile @@ -33,11 +33,11 @@ all: $(PROGRAMS) posixgroup.la: posixgroup.lo $(LIBTOOL) --mode=link $(CC) $(OPT) -version-info $(LTVER) \ - -rpath $(moduledir) -module -o $@ $? $(LIBS) + -rpath $(libdir) -module -o $@ $? $(LIBS) gssacl.la: gssacl.lo $(LIBTOOL) --mode=link $(CC) $(OPT) -version-info $(LTVER) \ - -rpath $(moduledir) -module -o $@ $? $(LIBS) + -rpath $(libdir) -module -o $@ $? $(LIBS) clean: rm -rf *.o *.lo *.la .libs diff --git a/contrib/slapd-modules/addpartial/Makefile b/contrib/slapd-modules/addpartial/Makefile index a999d7ffe2..00f0686e6e 100644 --- a/contrib/slapd-modules/addpartial/Makefile +++ b/contrib/slapd-modules/addpartial/Makefile @@ -33,7 +33,7 @@ all: $(PROGRAMS) addpartial.la: addpartial-overlay.lo $(LIBTOOL) --mode=link $(CC) $(OPT) -version-info $(LTVER) \ - -rpath $(moduledir) -module -o $@ $? $(LIBS) + -rpath $(libdir) -module -o $@ $? $(LIBS) clean: rm -rf *.o *.lo *.la .libs diff --git a/contrib/slapd-modules/adremap/Makefile b/contrib/slapd-modules/adremap/Makefile index b4c0d7b9e2..a9c3b0c9bf 100644 --- a/contrib/slapd-modules/adremap/Makefile +++ b/contrib/slapd-modules/adremap/Makefile @@ -47,7 +47,7 @@ all: $(PROGRAMS) adremap.la: adremap.lo $(LIBTOOL) --mode=link $(CC) $(OPT) -version-info $(LTVER) \ - -rpath $(moduledir) -module -o $@ $? $(LIBS) + -rpath $(libdir) -module -o $@ $? $(LIBS) clean: rm -rf *.o *.lo *.la .libs diff --git a/contrib/slapd-modules/allop/Makefile b/contrib/slapd-modules/allop/Makefile index 04de358fbc..3b33546bfb 100644 --- a/contrib/slapd-modules/allop/Makefile +++ b/contrib/slapd-modules/allop/Makefile @@ -37,7 +37,7 @@ all: $(PROGRAMS) allop.la: allop.lo $(LIBTOOL) --mode=link $(CC) $(OPT) -version-info $(LTVER) \ - -rpath $(moduledir) -module -o $@ $? $(LIBS) + -rpath $(libdir) -module -o $@ $? $(LIBS) clean: rm -rf *.o *.lo *.la .libs diff --git a/contrib/slapd-modules/allowed/Makefile b/contrib/slapd-modules/allowed/Makefile index a9b7650599..3af8792763 100644 --- a/contrib/slapd-modules/allowed/Makefile +++ b/contrib/slapd-modules/allowed/Makefile @@ -45,7 +45,7 @@ all: $(PROGRAMS) allowed.la: allowed.lo $(LIBTOOL) --mode=link $(CC) $(OPT) -version-info $(LTVER) \ - -rpath $(moduledir) -module -o $@ $? $(LIBS) + -rpath $(libdir) -module -o $@ $? $(LIBS) clean: rm -rf *.o *.lo *.la .libs diff --git a/contrib/slapd-modules/authzid/Makefile b/contrib/slapd-modules/authzid/Makefile index 575cbe2665..d53116f47b 100644 --- a/contrib/slapd-modules/authzid/Makefile +++ b/contrib/slapd-modules/authzid/Makefile @@ -45,7 +45,7 @@ all: $(PROGRAMS) authzid.la: authzid.lo $(LIBTOOL) --mode=link $(CC) $(OPT) -version-info $(LTVER) \ - -rpath $(moduledir) -module -o $@ $? $(LIBS) + -rpath $(libdir) -module -o $@ $? $(LIBS) clean: rm -rf *.o *.lo *.la .libs diff --git a/contrib/slapd-modules/autogroup/Makefile b/contrib/slapd-modules/autogroup/Makefile index efd9678eef..6edb422694 100644 --- a/contrib/slapd-modules/autogroup/Makefile +++ b/contrib/slapd-modules/autogroup/Makefile @@ -33,7 +33,7 @@ all: $(PROGRAMS) autogroup.la: autogroup.lo $(LIBTOOL) --mode=link $(CC) $(OPT) -version-info $(LTVER) \ - -rpath $(moduledir) -module -o $@ $? $(LIBS) + -rpath $(libdir) -module -o $@ $? $(LIBS) clean: rm -rf *.o *.lo *.la .libs diff --git a/contrib/slapd-modules/cloak/Makefile b/contrib/slapd-modules/cloak/Makefile index d120be09ae..d0824500d7 100644 --- a/contrib/slapd-modules/cloak/Makefile +++ b/contrib/slapd-modules/cloak/Makefile @@ -37,7 +37,7 @@ all: $(PROGRAMS) cloak.la: cloak.lo $(LIBTOOL) --mode=link $(CC) $(OPT) -version-info $(LTVER) \ - -rpath $(moduledir) -module -o $@ $? $(LIBS) + -rpath $(libdir) -module -o $@ $? $(LIBS) clean: rm -rf *.o *.lo *.la .libs diff --git a/contrib/slapd-modules/comp_match/Makefile b/contrib/slapd-modules/comp_match/Makefile index cd1d9d998b..b1a6fdfb62 100644 --- a/contrib/slapd-modules/comp_match/Makefile +++ b/contrib/slapd-modules/comp_match/Makefile @@ -56,7 +56,7 @@ all: $(PROGRAMS) compmatch.la: componentlib.lo init.lo certificate.lo asn_to_syn_mr.lo authorityKeyIdentifier.lo crl.lo $(LIBTOOL) --mode=link $(CC) $(OPT) -version-info $(LTVER) \ - -rpath $(moduledir) -module -o $@ $? $(LIBS) + -rpath $(libdir) -module -o $@ $? $(LIBS) clean: rm -rf *.o *.lo *.la .libs diff --git a/contrib/slapd-modules/denyop/Makefile b/contrib/slapd-modules/denyop/Makefile index c8377623cd..a9dc762d11 100644 --- a/contrib/slapd-modules/denyop/Makefile +++ b/contrib/slapd-modules/denyop/Makefile @@ -33,7 +33,7 @@ all: $(PROGRAMS) denyop.la: denyop.lo $(LIBTOOL) --mode=link $(CC) $(OPT) -version-info $(LTVER) \ - -rpath $(moduledir) -module -o $@ $? $(LIBS) + -rpath $(libdir) -module -o $@ $? $(LIBS) clean: rm -rf *.o *.lo *.la .libs diff --git a/contrib/slapd-modules/dsaschema/Makefile b/contrib/slapd-modules/dsaschema/Makefile index 5ca4b4fda4..7b7af1ca9a 100644 --- a/contrib/slapd-modules/dsaschema/Makefile +++ b/contrib/slapd-modules/dsaschema/Makefile @@ -33,7 +33,7 @@ all: $(PROGRAMS) dsaschema.la: dsaschema.lo $(LIBTOOL) --mode=link $(CC) $(OPT) -version-info $(LTVER) \ - -rpath $(moduledir) -module -o $@ $? $(LIBS) + -rpath $(libdir) -module -o $@ $? $(LIBS) clean: rm -rf *.o *.lo *.la .libs diff --git a/contrib/slapd-modules/dupent/Makefile b/contrib/slapd-modules/dupent/Makefile index 5322616799..2a44dd3eb0 100644 --- a/contrib/slapd-modules/dupent/Makefile +++ b/contrib/slapd-modules/dupent/Makefile @@ -45,7 +45,7 @@ all: $(PROGRAMS) dupent.la: dupent.lo $(LIBTOOL) --mode=link $(CC) $(OPT) -version-info $(LTVER) \ - -rpath $(moduledir) -module -o $@ $? $(LIBS) + -rpath $(libdir) -module -o $@ $? $(LIBS) clean: rm -rf *.o *.lo *.la .libs diff --git a/contrib/slapd-modules/kinit/Makefile b/contrib/slapd-modules/kinit/Makefile index 2a925edd08..8e0db28ff1 100644 --- a/contrib/slapd-modules/kinit/Makefile +++ b/contrib/slapd-modules/kinit/Makefile @@ -33,7 +33,7 @@ all: $(PROGRAMS) kinit.la: kinit.lo $(LIBTOOL) --mode=link $(CC) $(OPT) -version-info $(LTVER) \ - -rpath $(moduledir) -module -o $@ $? $(LIBS) + -rpath $(libdir) -module -o $@ $? $(LIBS) clean: rm -rf *.o *.lo *.la .libs diff --git a/contrib/slapd-modules/lastbind/Makefile b/contrib/slapd-modules/lastbind/Makefile index bdc1b787e6..eb36163b46 100644 --- a/contrib/slapd-modules/lastbind/Makefile +++ b/contrib/slapd-modules/lastbind/Makefile @@ -47,7 +47,7 @@ all: $(PROGRAMS) lastbind.la: lastbind.lo $(LIBTOOL) --mode=link $(CC) $(OPT) -version-info $(LTVER) \ - -rpath $(moduledir) -module -o $@ $? $(LIBS) + -rpath $(libdir) -module -o $@ $? $(LIBS) clean: rm -rf *.o *.lo *.la .libs diff --git a/contrib/slapd-modules/lastmod/Makefile b/contrib/slapd-modules/lastmod/Makefile index 9bda2571e0..6e75c80faf 100644 --- a/contrib/slapd-modules/lastmod/Makefile +++ b/contrib/slapd-modules/lastmod/Makefile @@ -37,7 +37,7 @@ all: $(PROGRAMS) lastmod.la: lastmod.lo $(LIBTOOL) --mode=link $(CC) $(OPT) -version-info $(LTVER) \ - -rpath $(moduledir) -module -o $@ $? $(LIBS) + -rpath $(libdir) -module -o $@ $? $(LIBS) clean: rm -rf *.o *.lo *.la .libs diff --git a/contrib/slapd-modules/noopsrch/Makefile b/contrib/slapd-modules/noopsrch/Makefile index bb19564bca..38c2cb5547 100644 --- a/contrib/slapd-modules/noopsrch/Makefile +++ b/contrib/slapd-modules/noopsrch/Makefile @@ -45,7 +45,7 @@ all: $(PROGRAMS) noopsrch.la: noopsrch.lo $(LIBTOOL) --mode=link $(CC) $(OPT) -version-info $(LTVER) \ - -rpath $(moduledir) -module -o $@ $? $(LIBS) + -rpath $(libdir) -module -o $@ $? $(LIBS) clean: rm -rf *.o *.lo *.la .libs diff --git a/contrib/slapd-modules/nops/Makefile b/contrib/slapd-modules/nops/Makefile index 8cf86199ae..7f826d312c 100644 --- a/contrib/slapd-modules/nops/Makefile +++ b/contrib/slapd-modules/nops/Makefile @@ -37,7 +37,7 @@ all: $(PROGRAMS) nops.la: nops.lo $(LIBTOOL) --mode=link $(CC) $(OPT) -version-info $(LTVER) \ - -rpath $(moduledir) -module -o $@ $? $(LIBS) + -rpath $(libdir) -module -o $@ $? $(LIBS) clean: rm -rf *.o *.lo *.la .libs diff --git a/contrib/slapd-modules/nssov/Makefile b/contrib/slapd-modules/nssov/Makefile index 85e9a0b2ec..b550b64ba9 100644 --- a/contrib/slapd-modules/nssov/Makefile +++ b/contrib/slapd-modules/nssov/Makefile @@ -66,7 +66,7 @@ $(OBJS): nssov.h nssov.la: $(OBJS) $(XOBJS) $(LIBTOOL) --mode=link $(CC) $(OPT) -version-info 0:0:0 \ - -rpath $(moduledir) -module -o $@ $(OBJS) $(XOBJS) $(LIBS) + -rpath $(libdir) -module -o $@ $(OBJS) $(XOBJS) $(LIBS) install: install-lib install-man FORCE diff --git a/contrib/slapd-modules/passwd/Makefile b/contrib/slapd-modules/passwd/Makefile index d00b32c399..a77300bde3 100644 --- a/contrib/slapd-modules/passwd/Makefile +++ b/contrib/slapd-modules/passwd/Makefile @@ -37,19 +37,19 @@ all: $(PROGRAMS) pw-kerberos.la: kerberos.lo $(LIBTOOL) --mode=link $(CC) $(OPT) -version-info $(LTVER) \ - -rpath $(moduledir) -module -o $@ $? -lkrb5 + -rpath $(libdir) -module -o $@ $? -lkrb5 pw-netscape.la: netscape.lo $(LIBTOOL) --mode=link $(CC) $(OPT) -version-info $(LTVER) \ - -rpath $(moduledir) -module -o $@ $? + -rpath $(libdir) -module -o $@ $? pw-radius.la: radius.lo $(LIBTOOL) --mode=link $(CC) $(OPT) -version-info $(LTVER) \ - -rpath $(moduledir) -module -o $@ $? -lradius + -rpath $(libdir) -module -o $@ $? -lradius pw-apr1.la: apr1.lo $(LIBTOOL) --mode=link $(CC) $(OPT) -version-info $(LTVER) \ - -rpath $(moduledir) -module -o $@ $? + -rpath $(libdir) -module -o $@ $? clean: rm -rf *.o *.lo *.la .libs diff --git a/contrib/slapd-modules/passwd/pbkdf2/Makefile b/contrib/slapd-modules/passwd/pbkdf2/Makefile index fa98b0f0fc..fe16b8c74c 100644 --- a/contrib/slapd-modules/passwd/pbkdf2/Makefile +++ b/contrib/slapd-modules/passwd/pbkdf2/Makefile @@ -40,7 +40,7 @@ all: $(PROGRAMS) pw-pbkdf2.la: pw-pbkdf2.lo $(LIBTOOL) --mode=link $(CC) $(OPT) -version-info $(LTVER) \ - -rpath $(moduledir) -module -o $@ $? $(LIBS) + -rpath $(libdir) -module -o $@ $? $(LIBS) clean: rm -rf *.o *.lo *.la .libs diff --git a/contrib/slapd-modules/passwd/sha2/Makefile b/contrib/slapd-modules/passwd/sha2/Makefile index e9fbc234ba..5fd195c134 100644 --- a/contrib/slapd-modules/passwd/sha2/Makefile +++ b/contrib/slapd-modules/passwd/sha2/Makefile @@ -38,7 +38,7 @@ all: $(PROGRAMS) pw-sha2.la: slapd-sha2.lo sha2.lo $(LIBTOOL) --mode=link $(CC) $(OPT) -version-info $(LTVER) \ - -rpath $(moduledir) -module -o $@ $? $(LIBS) + -rpath $(libdir) -module -o $@ $? $(LIBS) clean: rm -rf *.o *.lo *.la .libs diff --git a/contrib/slapd-modules/passwd/totp/Makefile b/contrib/slapd-modules/passwd/totp/Makefile index 2318befbf5..ea46a7df66 100644 --- a/contrib/slapd-modules/passwd/totp/Makefile +++ b/contrib/slapd-modules/passwd/totp/Makefile @@ -37,7 +37,7 @@ all: $(PROGRAMS) pw-totp.la: slapd-totp.lo $(LIBTOOL) --mode=link $(CC) $(OPT) -version-info $(LTVER) \ - -rpath $(moduledir) -module -o $@ $? $(LIBS) + -rpath $(libdir) -module -o $@ $? $(LIBS) clean: rm -rf *.o *.lo *.la .libs diff --git a/contrib/slapd-modules/proxyOld/Makefile b/contrib/slapd-modules/proxyOld/Makefile index 3c7b222c31..29c9cc15ed 100644 --- a/contrib/slapd-modules/proxyOld/Makefile +++ b/contrib/slapd-modules/proxyOld/Makefile @@ -45,7 +45,7 @@ all: $(PROGRAMS) proxyOld.la: proxyOld.lo $(LIBTOOL) --mode=link $(CC) $(OPT) -version-info $(LTVER) \ - -rpath $(moduledir) -module -o $@ $? $(LIBS) + -rpath $(libdir) -module -o $@ $? $(LIBS) clean: rm -rf *.o *.lo *.la .libs diff --git a/contrib/slapd-modules/samba4/Makefile b/contrib/slapd-modules/samba4/Makefile index 92bd29e730..7c2102e71c 100644 --- a/contrib/slapd-modules/samba4/Makefile +++ b/contrib/slapd-modules/samba4/Makefile @@ -47,15 +47,15 @@ all: $(PROGRAMS) pguid.la: pguid.lo $(LIBTOOL) --mode=link $(CC) $(OPT) -version-info $(LTVER) \ - -rpath $(moduledir) -module -o $@ $? $(LIBS) + -rpath $(libdir) -module -o $@ $? $(LIBS) rdnval.la: rdnval.lo $(LIBTOOL) --mode=link $(CC) $(OPT) -version-info $(LTVER) \ - -rpath $(moduledir) -module -o $@ $? $(LIBS) + -rpath $(libdir) -module -o $@ $? $(LIBS) vernum.la: vernum.lo $(LIBTOOL) --mode=link $(CC) $(OPT) -version-info $(LTVER) \ - -rpath $(moduledir) -module -o $@ $? $(LIBS) + -rpath $(libdir) -module -o $@ $? $(LIBS) clean: rm -rf *.o *.lo *.la .libs diff --git a/contrib/slapd-modules/smbk5pwd/Makefile b/contrib/slapd-modules/smbk5pwd/Makefile index 3ba9cb5b40..02fb5dcd67 100644 --- a/contrib/slapd-modules/smbk5pwd/Makefile +++ b/contrib/slapd-modules/smbk5pwd/Makefile @@ -56,7 +56,7 @@ all: $(PROGRAMS) smbk5pwd.la: smbk5pwd.lo $(LIBTOOL) --mode=link $(CC) $(OPT) -version-info $(LTVER) \ - -rpath $(moduledir) -module -o $@ $? $(LIBS) + -rpath $(libdir) -module -o $@ $? $(LIBS) clean: rm -rf *.o *.lo *.la .libs diff --git a/contrib/slapd-modules/trace/Makefile b/contrib/slapd-modules/trace/Makefile index 2c36ae75b0..8742b6be97 100644 --- a/contrib/slapd-modules/trace/Makefile +++ b/contrib/slapd-modules/trace/Makefile @@ -33,7 +33,7 @@ all: $(PROGRAMS) trace.la: trace.lo $(LIBTOOL) --mode=link $(CC) $(OPT) -version-info $(LTVER) \ - -rpath $(moduledir) -module -o $@ $? $(LIBS) + -rpath $(libdir) -module -o $@ $? $(LIBS) clean: rm -rf *.o *.lo *.la .libs diff --git a/contrib/slapd-modules/usn/Makefile b/contrib/slapd-modules/usn/Makefile index db09580848..93d3c92c3f 100644 --- a/contrib/slapd-modules/usn/Makefile +++ b/contrib/slapd-modules/usn/Makefile @@ -33,7 +33,7 @@ all: $(PROGRAMS) usn.la: usn.lo $(LIBTOOL) --mode=link $(CC) $(OPT) -version-info $(LTVER) \ - -rpath $(moduledir) -module -o $@ $? $(LIBS) + -rpath $(libdir) -module -o $@ $? $(LIBS) clean: rm -rf *.o *.lo *.la .libs diff --git a/contrib/slapd-modules/vc/Makefile b/contrib/slapd-modules/vc/Makefile index 886183a0d9..b07e5634ab 100644 --- a/contrib/slapd-modules/vc/Makefile +++ b/contrib/slapd-modules/vc/Makefile @@ -45,7 +45,7 @@ all: $(PROGRAMS) vc.la: vc.lo $(LIBTOOL) --mode=link $(CC) $(OPT) -version-info $(LTVER) \ - -rpath $(moduledir) -module -o $@ $? $(LIBS) + -rpath $(libdir) -module -o $@ $? $(LIBS) clean: rm -rf *.o *.lo *.la .libs