From ea58e1ee556f7fcbb797cc06d3ec70d3316e14b7 Mon Sep 17 00:00:00 2001 From: SATOH Fumiyasu Date: Fri, 10 Jan 2014 16:49:49 +0900 Subject: [PATCH] ITS#7782 tweak contrib/slapd-modules/**/Makefile Set LDAP_BUILD=$(LDAP_SRC) by default --- contrib/slapd-modules/acl/Makefile | 2 +- contrib/slapd-modules/addpartial/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 | 2 +- contrib/slapd-modules/passwd/sha2/Makefile | 2 +- contrib/slapd-modules/proxyOld/Makefile | 2 +- contrib/slapd-modules/samba4/Makefile | 2 +- contrib/slapd-modules/smbk5pwd/Makefile | 2 +- contrib/slapd-modules/trace/Makefile | 2 +- contrib/slapd-modules/usn/Makefile | 2 +- contrib/slapd-modules/vc/Makefile | 2 +- 25 files changed, 25 insertions(+), 25 deletions(-) diff --git a/contrib/slapd-modules/acl/Makefile b/contrib/slapd-modules/acl/Makefile index a381981043..40a8e9ecca 100644 --- a/contrib/slapd-modules/acl/Makefile +++ b/contrib/slapd-modules/acl/Makefile @@ -1,7 +1,7 @@ # $OpenLDAP$ LDAP_SRC = ../../.. -LDAP_BUILD = ../../.. +LDAP_BUILD = $(LDAP_SRC) LDAP_INC = -I$(LDAP_BUILD)/include -I$(LDAP_SRC)/include -I$(LDAP_SRC)/servers/slapd LDAP_LIB = $(LDAP_BUILD)/libraries/libldap_r/libldap_r.la \ $(LDAP_BUILD)/libraries/liblber/liblber.la diff --git a/contrib/slapd-modules/addpartial/Makefile b/contrib/slapd-modules/addpartial/Makefile index fc6c7c9089..a999d7ffe2 100644 --- a/contrib/slapd-modules/addpartial/Makefile +++ b/contrib/slapd-modules/addpartial/Makefile @@ -1,7 +1,7 @@ # $OpenLDAP$ LDAP_SRC = ../../.. -LDAP_BUILD = ../../.. +LDAP_BUILD = $(LDAP_SRC) LDAP_INC = -I$(LDAP_BUILD)/include -I$(LDAP_SRC)/include -I$(LDAP_SRC)/servers/slapd LDAP_LIB = $(LDAP_BUILD)/libraries/libldap_r/libldap_r.la \ $(LDAP_BUILD)/libraries/liblber/liblber.la diff --git a/contrib/slapd-modules/allop/Makefile b/contrib/slapd-modules/allop/Makefile index 78127075f0..1af134cadf 100644 --- a/contrib/slapd-modules/allop/Makefile +++ b/contrib/slapd-modules/allop/Makefile @@ -1,7 +1,7 @@ # $OpenLDAP$ LDAP_SRC = ../../.. -LDAP_BUILD = ../../.. +LDAP_BUILD = $(LDAP_SRC) LDAP_INC = -I$(LDAP_BUILD)/include -I$(LDAP_SRC)/include -I$(LDAP_SRC)/servers/slapd LDAP_LIB = $(LDAP_BUILD)/libraries/libldap_r/libldap_r.la \ $(LDAP_BUILD)/libraries/liblber/liblber.la diff --git a/contrib/slapd-modules/allowed/Makefile b/contrib/slapd-modules/allowed/Makefile index c961e26302..68db224f11 100644 --- a/contrib/slapd-modules/allowed/Makefile +++ b/contrib/slapd-modules/allowed/Makefile @@ -13,7 +13,7 @@ # . LDAP_SRC = ../../.. -LDAP_BUILD = ../../.. +LDAP_BUILD = $(LDAP_SRC) LDAP_INC = -I$(LDAP_BUILD)/include -I$(LDAP_SRC)/include -I$(LDAP_SRC)/servers/slapd LDAP_LIB = $(LDAP_BUILD)/libraries/libldap_r/libldap_r.la \ $(LDAP_BUILD)/libraries/liblber/liblber.la diff --git a/contrib/slapd-modules/authzid/Makefile b/contrib/slapd-modules/authzid/Makefile index 555fbb9ee1..e3b355c7cb 100644 --- a/contrib/slapd-modules/authzid/Makefile +++ b/contrib/slapd-modules/authzid/Makefile @@ -13,7 +13,7 @@ # . LDAP_SRC = ../../.. -LDAP_BUILD = ../../.. +LDAP_BUILD = $(LDAP_SRC) LDAP_INC = -I$(LDAP_BUILD)/include -I$(LDAP_SRC)/include -I$(LDAP_SRC)/servers/slapd LDAP_LIB = $(LDAP_BUILD)/libraries/libldap_r/libldap_r.la \ $(LDAP_BUILD)/libraries/liblber/liblber.la diff --git a/contrib/slapd-modules/autogroup/Makefile b/contrib/slapd-modules/autogroup/Makefile index e8ee0adc6d..efd9678eef 100644 --- a/contrib/slapd-modules/autogroup/Makefile +++ b/contrib/slapd-modules/autogroup/Makefile @@ -1,7 +1,7 @@ # $OpenLDAP$ LDAP_SRC = ../../.. -LDAP_BUILD = ../../.. +LDAP_BUILD = $(LDAP_SRC) LDAP_INC = -I$(LDAP_BUILD)/include -I$(LDAP_SRC)/include -I$(LDAP_SRC)/servers/slapd LDAP_LIB = $(LDAP_BUILD)/libraries/libldap_r/libldap_r.la \ $(LDAP_BUILD)/libraries/liblber/liblber.la diff --git a/contrib/slapd-modules/cloak/Makefile b/contrib/slapd-modules/cloak/Makefile index 4f116bcf26..424e3b7543 100644 --- a/contrib/slapd-modules/cloak/Makefile +++ b/contrib/slapd-modules/cloak/Makefile @@ -1,7 +1,7 @@ # $OpenLDAP$ LDAP_SRC = ../../.. -LDAP_BUILD = ../../.. +LDAP_BUILD = $(LDAP_SRC) LDAP_INC = -I$(LDAP_BUILD)/include -I$(LDAP_SRC)/include -I$(LDAP_SRC)/servers/slapd LDAP_LIB = $(LDAP_BUILD)/libraries/libldap_r/libldap_r.la \ $(LDAP_BUILD)/libraries/liblber/liblber.la diff --git a/contrib/slapd-modules/comp_match/Makefile b/contrib/slapd-modules/comp_match/Makefile index f1c6424720..4e55ad396c 100644 --- a/contrib/slapd-modules/comp_match/Makefile +++ b/contrib/slapd-modules/comp_match/Makefile @@ -16,7 +16,7 @@ # . LDAP_SRC = ../../.. -LDAP_BUILD = ../../.. +LDAP_BUILD = $(LDAP_SRC) LDAP_INC = -I$(LDAP_BUILD)/include -I$(LDAP_SRC)/include -I$(LDAP_SRC)/servers/slapd LDAP_LIB = $(LDAP_BUILD)/libraries/libldap_r/libldap_r.la \ $(LDAP_BUILD)/libraries/liblber/liblber.la diff --git a/contrib/slapd-modules/denyop/Makefile b/contrib/slapd-modules/denyop/Makefile index 5a2864c8fe..c8377623cd 100644 --- a/contrib/slapd-modules/denyop/Makefile +++ b/contrib/slapd-modules/denyop/Makefile @@ -1,7 +1,7 @@ # $OpenLDAP$ LDAP_SRC = ../../.. -LDAP_BUILD = ../../.. +LDAP_BUILD = $(LDAP_SRC) LDAP_INC = -I$(LDAP_BUILD)/include -I$(LDAP_SRC)/include -I$(LDAP_SRC)/servers/slapd LDAP_LIB = $(LDAP_BUILD)/libraries/libldap_r/libldap_r.la \ $(LDAP_BUILD)/libraries/liblber/liblber.la diff --git a/contrib/slapd-modules/dsaschema/Makefile b/contrib/slapd-modules/dsaschema/Makefile index 4cc4953235..5ca4b4fda4 100644 --- a/contrib/slapd-modules/dsaschema/Makefile +++ b/contrib/slapd-modules/dsaschema/Makefile @@ -1,7 +1,7 @@ # $OpenLDAP$ LDAP_SRC = ../../.. -LDAP_BUILD = ../../.. +LDAP_BUILD = $(LDAP_SRC) LDAP_INC = -I$(LDAP_BUILD)/include -I$(LDAP_SRC)/include -I$(LDAP_SRC)/servers/slapd LDAP_LIB = $(LDAP_BUILD)/libraries/libldap_r/libldap_r.la \ $(LDAP_BUILD)/libraries/liblber/liblber.la diff --git a/contrib/slapd-modules/dupent/Makefile b/contrib/slapd-modules/dupent/Makefile index 14937d4200..984d49ab91 100644 --- a/contrib/slapd-modules/dupent/Makefile +++ b/contrib/slapd-modules/dupent/Makefile @@ -13,7 +13,7 @@ # . LDAP_SRC = ../../.. -LDAP_BUILD = ../../.. +LDAP_BUILD = $(LDAP_SRC) LDAP_INC = -I$(LDAP_BUILD)/include -I$(LDAP_SRC)/include -I$(LDAP_SRC)/servers/slapd LDAP_LIB = $(LDAP_BUILD)/libraries/libldap_r/libldap_r.la \ $(LDAP_BUILD)/libraries/liblber/liblber.la diff --git a/contrib/slapd-modules/kinit/Makefile b/contrib/slapd-modules/kinit/Makefile index 549a39f0c8..2a925edd08 100644 --- a/contrib/slapd-modules/kinit/Makefile +++ b/contrib/slapd-modules/kinit/Makefile @@ -1,7 +1,7 @@ # $OpenLDAP$ LDAP_SRC = ../../.. -LDAP_BUILD = ../../.. +LDAP_BUILD = $(LDAP_SRC) LDAP_INC = -I$(LDAP_BUILD)/include -I$(LDAP_SRC)/include -I$(LDAP_SRC)/servers/slapd LDAP_LIB = $(LDAP_BUILD)/libraries/libldap_r/libldap_r.la \ $(LDAP_BUILD)/libraries/liblber/liblber.la diff --git a/contrib/slapd-modules/lastbind/Makefile b/contrib/slapd-modules/lastbind/Makefile index de0b80003f..1745aa8435 100644 --- a/contrib/slapd-modules/lastbind/Makefile +++ b/contrib/slapd-modules/lastbind/Makefile @@ -11,7 +11,7 @@ # . LDAP_SRC = ../../.. -LDAP_BUILD = ../../.. +LDAP_BUILD = $(LDAP_SRC) LDAP_INC = -I$(LDAP_BUILD)/include -I$(LDAP_SRC)/include -I$(LDAP_SRC)/servers/slapd LDAP_LIB = $(LDAP_BUILD)/libraries/libldap_r/libldap_r.la \ $(LDAP_BUILD)/libraries/liblber/liblber.la diff --git a/contrib/slapd-modules/lastmod/Makefile b/contrib/slapd-modules/lastmod/Makefile index 521011aeb9..098984e805 100644 --- a/contrib/slapd-modules/lastmod/Makefile +++ b/contrib/slapd-modules/lastmod/Makefile @@ -1,7 +1,7 @@ # $OpenLDAP$ LDAP_SRC = ../../.. -LDAP_BUILD = ../../.. +LDAP_BUILD = $(LDAP_SRC) LDAP_INC = -I$(LDAP_BUILD)/include -I$(LDAP_SRC)/include -I$(LDAP_SRC)/servers/slapd LDAP_LIB = $(LDAP_BUILD)/libraries/libldap_r/libldap_r.la \ $(LDAP_BUILD)/libraries/liblber/liblber.la diff --git a/contrib/slapd-modules/noopsrch/Makefile b/contrib/slapd-modules/noopsrch/Makefile index d59c6e6af8..6f9bbeedf4 100644 --- a/contrib/slapd-modules/noopsrch/Makefile +++ b/contrib/slapd-modules/noopsrch/Makefile @@ -13,7 +13,7 @@ # . LDAP_SRC = ../../.. -LDAP_BUILD = ../../.. +LDAP_BUILD = $(LDAP_SRC) LDAP_INC = -I$(LDAP_BUILD)/include -I$(LDAP_SRC)/include -I$(LDAP_SRC)/servers/slapd LDAP_LIB = $(LDAP_BUILD)/libraries/libldap_r/libldap_r.la \ $(LDAP_BUILD)/libraries/liblber/liblber.la diff --git a/contrib/slapd-modules/nops/Makefile b/contrib/slapd-modules/nops/Makefile index 5cf03751bc..eda7b470f7 100644 --- a/contrib/slapd-modules/nops/Makefile +++ b/contrib/slapd-modules/nops/Makefile @@ -1,7 +1,7 @@ # $OpenLDAP$ LDAP_SRC = ../../.. -LDAP_BUILD = ../../.. +LDAP_BUILD = $(LDAP_SRC) LDAP_INC = -I$(LDAP_BUILD)/include -I$(LDAP_SRC)/include -I$(LDAP_SRC)/servers/slapd LDAP_LIB = $(LDAP_BUILD)/libraries/libldap_r/libldap_r.la \ $(LDAP_BUILD)/libraries/liblber/liblber.la diff --git a/contrib/slapd-modules/nssov/Makefile b/contrib/slapd-modules/nssov/Makefile index 28c8003a14..0075b44d06 100644 --- a/contrib/slapd-modules/nssov/Makefile +++ b/contrib/slapd-modules/nssov/Makefile @@ -17,7 +17,7 @@ LDAP_SRC=../../.. # Path to the OpenLDAP object tree - same as above unless # you're doing out-of-tree builds. -LDAP_BUILD=../../.. +LDAP_BUILD=$(LDAP_SRC) LDAP_INC = -I$(LDAP_BUILD)/include -I$(LDAP_SRC)/include -I$(LDAP_SRC)/servers/slapd LDAP_LIB = $(LDAP_BUILD)/libraries/libldap_r/libldap_r.la \ diff --git a/contrib/slapd-modules/passwd/Makefile b/contrib/slapd-modules/passwd/Makefile index e3def2be81..b4f2b93c9b 100644 --- a/contrib/slapd-modules/passwd/Makefile +++ b/contrib/slapd-modules/passwd/Makefile @@ -1,7 +1,7 @@ # $OpenLDAP$ LDAP_SRC = ../../.. -LDAP_BUILD = ../../.. +LDAP_BUILD = $(LDAP_SRC) LDAP_INC = -I$(LDAP_BUILD)/include -I$(LDAP_SRC)/include -I$(LDAP_SRC)/servers/slapd LDAP_LIB = $(LDAP_BUILD)/libraries/libldap_r/libldap_r.la \ $(LDAP_BUILD)/libraries/liblber/liblber.la diff --git a/contrib/slapd-modules/passwd/sha2/Makefile b/contrib/slapd-modules/passwd/sha2/Makefile index 06f647b0d2..0abab68f71 100644 --- a/contrib/slapd-modules/passwd/sha2/Makefile +++ b/contrib/slapd-modules/passwd/sha2/Makefile @@ -1,7 +1,7 @@ # $OpenLDAP$ LDAP_SRC = ../../../.. -LDAP_BUILD = ../../../.. +LDAP_BUILD = $(LDAP_SRC) LDAP_INC = -I$(LDAP_BUILD)/include -I$(LDAP_SRC)/include -I$(LDAP_SRC)/servers/slapd LDAP_LIB = $(LDAP_BUILD)/libraries/libldap_r/libldap_r.la \ $(LDAP_BUILD)/libraries/liblber/liblber.la diff --git a/contrib/slapd-modules/proxyOld/Makefile b/contrib/slapd-modules/proxyOld/Makefile index ea252ef3df..66a5497f46 100644 --- a/contrib/slapd-modules/proxyOld/Makefile +++ b/contrib/slapd-modules/proxyOld/Makefile @@ -13,7 +13,7 @@ # . LDAP_SRC = ../../.. -LDAP_BUILD = ../../.. +LDAP_BUILD = $(LDAP_SRC) LDAP_INC = -I$(LDAP_BUILD)/include -I$(LDAP_SRC)/include -I$(LDAP_SRC)/servers/slapd LDAP_LIB = $(LDAP_BUILD)/libraries/libldap_r/libldap_r.la \ $(LDAP_BUILD)/libraries/liblber/liblber.la diff --git a/contrib/slapd-modules/samba4/Makefile b/contrib/slapd-modules/samba4/Makefile index 529c0e986e..80dbd2e3dd 100644 --- a/contrib/slapd-modules/samba4/Makefile +++ b/contrib/slapd-modules/samba4/Makefile @@ -13,7 +13,7 @@ # . LDAP_SRC = ../../.. -LDAP_BUILD = ../../.. +LDAP_BUILD = $(LDAP_SRC) LDAP_INC = -I$(LDAP_BUILD)/include -I$(LDAP_SRC)/include -I$(LDAP_SRC)/servers/slapd LDAP_LIB = $(LDAP_BUILD)/libraries/libldap_r/libldap_r.la \ $(LDAP_BUILD)/libraries/liblber/liblber.la diff --git a/contrib/slapd-modules/smbk5pwd/Makefile b/contrib/slapd-modules/smbk5pwd/Makefile index 5c6c8fed1c..5d4e6c13f9 100644 --- a/contrib/slapd-modules/smbk5pwd/Makefile +++ b/contrib/slapd-modules/smbk5pwd/Makefile @@ -13,7 +13,7 @@ # . LDAP_SRC = ../../.. -LDAP_BUILD = ../../.. +LDAP_BUILD = $(LDAP_SRC) LDAP_INC = -I$(LDAP_BUILD)/include -I$(LDAP_SRC)/include -I$(LDAP_SRC)/servers/slapd LDAP_LIB = $(LDAP_BUILD)/libraries/libldap_r/libldap_r.la \ $(LDAP_BUILD)/libraries/liblber/liblber.la diff --git a/contrib/slapd-modules/trace/Makefile b/contrib/slapd-modules/trace/Makefile index 816737476e..2c36ae75b0 100644 --- a/contrib/slapd-modules/trace/Makefile +++ b/contrib/slapd-modules/trace/Makefile @@ -1,7 +1,7 @@ # $OpenLDAP$ LDAP_SRC = ../../.. -LDAP_BUILD = ../../.. +LDAP_BUILD = $(LDAP_SRC) LDAP_INC = -I$(LDAP_BUILD)/include -I$(LDAP_SRC)/include -I$(LDAP_SRC)/servers/slapd LDAP_LIB = $(LDAP_BUILD)/libraries/libldap_r/libldap_r.la \ $(LDAP_BUILD)/libraries/liblber/liblber.la diff --git a/contrib/slapd-modules/usn/Makefile b/contrib/slapd-modules/usn/Makefile index f13ed1c988..db09580848 100644 --- a/contrib/slapd-modules/usn/Makefile +++ b/contrib/slapd-modules/usn/Makefile @@ -1,7 +1,7 @@ # $OpenLDAP$ LDAP_SRC = ../../.. -LDAP_BUILD = ../../.. +LDAP_BUILD = $(LDAP_SRC) LDAP_INC = -I$(LDAP_BUILD)/include -I$(LDAP_SRC)/include -I$(LDAP_SRC)/servers/slapd LDAP_LIB = $(LDAP_BUILD)/libraries/libldap_r/libldap_r.la \ $(LDAP_BUILD)/libraries/liblber/liblber.la diff --git a/contrib/slapd-modules/vc/Makefile b/contrib/slapd-modules/vc/Makefile index 1957c0bdbf..22e2877844 100644 --- a/contrib/slapd-modules/vc/Makefile +++ b/contrib/slapd-modules/vc/Makefile @@ -13,7 +13,7 @@ # . LDAP_SRC = ../../.. -LDAP_BUILD = ../../.. +LDAP_BUILD = $(LDAP_SRC) LDAP_INC = -I$(LDAP_BUILD)/include -I$(LDAP_SRC)/include -I$(LDAP_SRC)/servers/slapd LDAP_LIB = $(LDAP_BUILD)/libraries/libldap_r/libldap_r.la \ $(LDAP_BUILD)/libraries/liblber/liblber.la -- 2.39.5