From 1d0a96e78ac327d35a6b720a8992a1712c9d9297 Mon Sep 17 00:00:00 2001 From: Quanah Gibson-Mount Date: Fri, 17 May 2019 17:03:02 +0000 Subject: [PATCH] Revert "ITS#9008 Do the same for contrib Makefiles" This reverts commit 3fa7d3c80551046645b5742b2afe899729eec1ea. --- contrib/slapd-modules/acl/Makefile | 4 ++-- contrib/slapd-modules/addpartial/Makefile | 2 +- contrib/slapd-modules/adremap/Makefile | 2 +- contrib/slapd-modules/allop/Makefile | 2 +- contrib/slapd-modules/allowed/Makefile | 2 +- contrib/slapd-modules/authzid/Makefile | 2 +- contrib/slapd-modules/autogroup/Makefile | 2 +- contrib/slapd-modules/cloak/Makefile | 2 +- contrib/slapd-modules/comp_match/Makefile | 2 +- contrib/slapd-modules/denyop/Makefile | 2 +- contrib/slapd-modules/dsaschema/Makefile | 2 +- contrib/slapd-modules/dupent/Makefile | 2 +- contrib/slapd-modules/kinit/Makefile | 2 +- contrib/slapd-modules/lastbind/Makefile | 2 +- contrib/slapd-modules/lastmod/Makefile | 2 +- contrib/slapd-modules/noopsrch/Makefile | 2 +- contrib/slapd-modules/nops/Makefile | 2 +- contrib/slapd-modules/nssov/Makefile | 2 +- contrib/slapd-modules/passwd/Makefile | 8 ++++---- contrib/slapd-modules/passwd/pbkdf2/Makefile | 2 +- contrib/slapd-modules/passwd/sha2/Makefile | 2 +- contrib/slapd-modules/passwd/totp/Makefile | 2 +- contrib/slapd-modules/proxyOld/Makefile | 2 +- contrib/slapd-modules/samba4/Makefile | 6 +++--- contrib/slapd-modules/smbk5pwd/Makefile | 2 +- contrib/slapd-modules/trace/Makefile | 2 +- contrib/slapd-modules/usn/Makefile | 2 +- contrib/slapd-modules/vc/Makefile | 2 +- 28 files changed, 34 insertions(+), 34 deletions(-) diff --git a/contrib/slapd-modules/acl/Makefile b/contrib/slapd-modules/acl/Makefile index 89b70fb0ad..40a8e9ecca 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 $(libdir) -module -o $@ $? $(LIBS) + -rpath $(moduledir) -module -o $@ $? $(LIBS) gssacl.la: gssacl.lo $(LIBTOOL) --mode=link $(CC) $(OPT) -version-info $(LTVER) \ - -rpath $(libdir) -module -o $@ $? $(LIBS) + -rpath $(moduledir) -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 00f0686e6e..a999d7ffe2 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 $(libdir) -module -o $@ $? $(LIBS) + -rpath $(moduledir) -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 a9c3b0c9bf..b4c0d7b9e2 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 $(libdir) -module -o $@ $? $(LIBS) + -rpath $(moduledir) -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 3b33546bfb..04de358fbc 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 $(libdir) -module -o $@ $? $(LIBS) + -rpath $(moduledir) -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 3af8792763..a9b7650599 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 $(libdir) -module -o $@ $? $(LIBS) + -rpath $(moduledir) -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 d53116f47b..575cbe2665 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 $(libdir) -module -o $@ $? $(LIBS) + -rpath $(moduledir) -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 6edb422694..efd9678eef 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 $(libdir) -module -o $@ $? $(LIBS) + -rpath $(moduledir) -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 d0824500d7..d120be09ae 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 $(libdir) -module -o $@ $? $(LIBS) + -rpath $(moduledir) -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 b1a6fdfb62..cd1d9d998b 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 $(libdir) -module -o $@ $? $(LIBS) + -rpath $(moduledir) -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 a9dc762d11..c8377623cd 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 $(libdir) -module -o $@ $? $(LIBS) + -rpath $(moduledir) -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 7b7af1ca9a..5ca4b4fda4 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 $(libdir) -module -o $@ $? $(LIBS) + -rpath $(moduledir) -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 2a44dd3eb0..5322616799 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 $(libdir) -module -o $@ $? $(LIBS) + -rpath $(moduledir) -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 8e0db28ff1..2a925edd08 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 $(libdir) -module -o $@ $? $(LIBS) + -rpath $(moduledir) -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 eb36163b46..bdc1b787e6 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 $(libdir) -module -o $@ $? $(LIBS) + -rpath $(moduledir) -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 6e75c80faf..9bda2571e0 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 $(libdir) -module -o $@ $? $(LIBS) + -rpath $(moduledir) -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 38c2cb5547..bb19564bca 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 $(libdir) -module -o $@ $? $(LIBS) + -rpath $(moduledir) -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 7f826d312c..8cf86199ae 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 $(libdir) -module -o $@ $? $(LIBS) + -rpath $(moduledir) -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 b550b64ba9..85e9a0b2ec 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 $(libdir) -module -o $@ $(OBJS) $(XOBJS) $(LIBS) + -rpath $(moduledir) -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 a77300bde3..d00b32c399 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 $(libdir) -module -o $@ $? -lkrb5 + -rpath $(moduledir) -module -o $@ $? -lkrb5 pw-netscape.la: netscape.lo $(LIBTOOL) --mode=link $(CC) $(OPT) -version-info $(LTVER) \ - -rpath $(libdir) -module -o $@ $? + -rpath $(moduledir) -module -o $@ $? pw-radius.la: radius.lo $(LIBTOOL) --mode=link $(CC) $(OPT) -version-info $(LTVER) \ - -rpath $(libdir) -module -o $@ $? -lradius + -rpath $(moduledir) -module -o $@ $? -lradius pw-apr1.la: apr1.lo $(LIBTOOL) --mode=link $(CC) $(OPT) -version-info $(LTVER) \ - -rpath $(libdir) -module -o $@ $? + -rpath $(moduledir) -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 fe16b8c74c..fa98b0f0fc 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 $(libdir) -module -o $@ $? $(LIBS) + -rpath $(moduledir) -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 5fd195c134..e9fbc234ba 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 $(libdir) -module -o $@ $? $(LIBS) + -rpath $(moduledir) -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 ea46a7df66..2318befbf5 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 $(libdir) -module -o $@ $? $(LIBS) + -rpath $(moduledir) -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 29c9cc15ed..3c7b222c31 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 $(libdir) -module -o $@ $? $(LIBS) + -rpath $(moduledir) -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 7c2102e71c..92bd29e730 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 $(libdir) -module -o $@ $? $(LIBS) + -rpath $(moduledir) -module -o $@ $? $(LIBS) rdnval.la: rdnval.lo $(LIBTOOL) --mode=link $(CC) $(OPT) -version-info $(LTVER) \ - -rpath $(libdir) -module -o $@ $? $(LIBS) + -rpath $(moduledir) -module -o $@ $? $(LIBS) vernum.la: vernum.lo $(LIBTOOL) --mode=link $(CC) $(OPT) -version-info $(LTVER) \ - -rpath $(libdir) -module -o $@ $? $(LIBS) + -rpath $(moduledir) -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 02fb5dcd67..3ba9cb5b40 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 $(libdir) -module -o $@ $? $(LIBS) + -rpath $(moduledir) -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 8742b6be97..2c36ae75b0 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 $(libdir) -module -o $@ $? $(LIBS) + -rpath $(moduledir) -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 93d3c92c3f..db09580848 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 $(libdir) -module -o $@ $? $(LIBS) + -rpath $(moduledir) -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 b07e5634ab..886183a0d9 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 $(libdir) -module -o $@ $? $(LIBS) + -rpath $(moduledir) -module -o $@ $? $(LIBS) clean: rm -rf *.o *.lo *.la .libs