ITS#9008 Do the same for contrib Makefiles

diff --git a/contrib/slapd-modules/acl/Makefile b/contrib/slapd-modules/acl/Makefile
index 40a8e9ecca254ea2343ca99ce11252dc35fb6155..89b70fb0ad887ca8601fb6cfb72930be3c48e0e9 100644 (file)
--- 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 a999d7ffe2e583b52536be49b739082027a341bc..00f0686e6e01c735732776f81d7e301859731667 100644 (file)
--- 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 b4c0d7b9e26e345e5af5e0a30ec6f2beb9a61485..a9c3b0c9bff32072aaf800d0234e715bbdb8c525 100644 (file)
--- 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 04de358fbc4883e52492585d1697155c30bd9655..3b33546bfb7c906c4b731136fd080e9d5ea4487f 100644 (file)
--- 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 a9b7650599b91b845775a54350bd04b0c1e7f87b..3af8792763b89afe6351b34be6d799ad3bed7904 100644 (file)
--- 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 575cbe266579452d398ee45f828d6181f2b297fb..d53116f47b2950ebe412097faf239c2788d5f75b 100644 (file)
--- 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 efd9678eeff17c6d57d69d993ccc1a604038cd8a..6edb422694ea74f2da4474653d9c81b589cfca07 100644 (file)
--- 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 d120be09ae18f86a31af0abd9cbb0c56fc521cc0..d0824500d73537a8545baad78009e8a73ffccd04 100644 (file)
--- 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 cd1d9d998b7dcd51534e07d720d5ea5ebbe40088..b1a6fdfb6239c35340a53c6d688723f555dd549d 100644 (file)
--- 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 c8377623cdc95a32023fe4bd137fb3b1eaf1bb9c..a9dc762d11395beaddac911eac08da39d792c3f2 100644 (file)
--- 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 5ca4b4fda42c4918323598f7cf941f33160c2464..7b7af1ca9a20de73e82353a5b4769df32cf44763 100644 (file)
--- 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 532261679941e3ef5ff4b3ba9f6247cba093369c..2a44dd3eb033c547524b47d06d4491c785d12448 100644 (file)
--- 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 2a925edd0862ae73649ad8a790730f6784f457ac..8e0db28ff1dbd9feabdd64b6b751214e0dc2b5a5 100644 (file)
--- 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 bdc1b787e666ec2ba7e83c6f81855f7bcd92c401..eb36163b468237f75dba6a305e39ef8a2c2e1812 100644 (file)
--- 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 9bda2571e0924e38610942e22c82e900c03f0264..6e75c80fafdf8be994fb1ac9b2fed0f09cd5286b 100644 (file)
--- 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 bb19564bca59ea72764253086efa39699008a785..38c2cb554761e1538525e3ff074d53f2335ce502 100644 (file)
--- 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 8cf86199ae53ce932cfe5ea312da917ad5f89fd6..7f826d312c049cf9ec2c1ccceab5b86366efb692 100644 (file)
--- 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 85e9a0b2ece2bac20357a26969d1e58bc347e857..b550b64ba9ff7664d127b05fd986ce7499024c20 100644 (file)
--- 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 d00b32c399ab51cdf7cade4e87e845fe513e5842..a77300bde3e7fdab98b84ad972a9e62142d93558 100644 (file)
--- 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 fa98b0f0fcea5117086b7d1874d9afc5e7e2c94b..fe16b8c74c27e9f8a648765187698c838a3708f3 100644 (file)
--- 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 e9fbc234ba81bc7655165e2776b91963a668781d..5fd195c13401fb2680d82b34d7adfa182b7dc8bf 100644 (file)
--- 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 2318befbf5b02afcd42b89c728cd10614f7c21c0..ea46a7df6606b8bbdae4c439c59f1617eeb1a58e 100644 (file)
--- 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 3c7b222c31b86143eaa7220f5ef50d7d55069e07..29c9cc15ed23a8cd8aec600dc8aa947150865428 100644 (file)
--- 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 92bd29e73017a46b8ccffeb58c097b5c44b53d2d..7c2102e71c1dfa198458383267b57a2e48ba8484 100644 (file)
--- 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 3ba9cb5b400ef9d27c8040b1216b5b29a2338d0c..02fb5dcd67f4babb5f4fe37e9abbe8d531a1a721 100644 (file)
--- 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 2c36ae75b06ee7420f7a1c411174679f3e516f96..8742b6be97d687ad86c40d591d6b39a2a6dee6f3 100644 (file)
--- 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 db095808482df91b599e05cc7a7c9e0bf52adac2..93d3c92c3fb98c5e98c1e71ea7ce26f56020c578 100644 (file)
--- 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 886183a0d94660a7657f31d1edb0b23423e17b29..b07e5634abc59db7786786a7adffa1c9f0b0ce30 100644 (file)
--- 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