summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRich Megginson <rmeggins@redhat.com>2010-08-16 14:15:23 -0600
committerRich Megginson <rmeggins@redhat.com>2010-08-31 13:35:54 -0600
commit99c467c2d7b3031f15dc1b6db79e7d1c580b4719 (patch)
treee0d0ac78ba2c2099f542b33ea96a9fbdb7313d10
parenta5564abf94f8951a8a3ce6fa51b5e2f26b617711 (diff)
downloadds-99c467c2d7b3031f15dc1b6db79e7d1c580b4719.tar.gz
ds-99c467c2d7b3031f15dc1b6db79e7d1c580b4719.tar.xz
ds-99c467c2d7b3031f15dc1b6db79e7d1c580b4719.zip
add ldaptool_opts for the non BUNDLE case in Makefile.am
forgot to add ldaptool_opts for the non BUNDLE case in Makefile.am
-rw-r--r--Makefile.am1
-rw-r--r--Makefile.in1
2 files changed, 2 insertions, 0 deletions
diff --git a/Makefile.am b/Makefile.am
index dc22ce10..b41de4e4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1364,6 +1364,7 @@ fixupcmd = sed \
-e 's,@ldapsdk_libdir\@,$(ldapsdk_libdir),g' \
-e 's,@ldapsdk_bindir\@,$(ldapsdk_bindir),g' \
-e 's,@ldaptool_bindir\@,$(ldaptool_bindir),g' \
+ -e 's,@ldaptool_opts\@,$(ldaptool_opts),g' \
-e 's,@plainldif_opts\@,$(plainldif_opts),g' \
-e 's,@db_libdir\@,$(db_libdir),g' \
-e 's,@db_bindir\@,$(db_bindir),g' \
diff --git a/Makefile.in b/Makefile.in
index f6d38e92..6f677c89 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -2296,6 +2296,7 @@ rsearch_bin_LDADD = $(NSPR_LINK) $(NSS_LINK) $(LDAPSDK_LINK) $(SASL_LINK) $(LIBS
@BUNDLE_FALSE@ -e 's,@ldapsdk_libdir\@,$(ldapsdk_libdir),g' \
@BUNDLE_FALSE@ -e 's,@ldapsdk_bindir\@,$(ldapsdk_bindir),g' \
@BUNDLE_FALSE@ -e 's,@ldaptool_bindir\@,$(ldaptool_bindir),g' \
+@BUNDLE_FALSE@ -e 's,@ldaptool_opts\@,$(ldaptool_opts),g' \
@BUNDLE_FALSE@ -e 's,@plainldif_opts\@,$(plainldif_opts),g' \
@BUNDLE_FALSE@ -e 's,@db_libdir\@,$(db_libdir),g' \
@BUNDLE_FALSE@ -e 's,@db_bindir\@,$(db_bindir),g' \