dirs: Add variable for bindir.

brcompatd wants to use this in an upcoming commit.

diff --git a/lib/automake.mk b/lib/automake.mk
index 63bb02740f6958a23a5806a25b9286a736786d2d..255e2fd35861b7b6f351eacb82ec1df0f5c7d2cd 100644 (file)
--- a/lib/automake.mk
+++ b/lib/automake.mk
@@ -149,7 +149,8 @@ lib/dirs.c: Makefile
        ($(ro_c) && \
         echo 'const char ovs_pkgdatadir[] = "$(pkgdatadir)";' && \
         echo 'const char ovs_rundir[] = "@RUNDIR@";' && \
-        echo 'const char ovs_logdir[] = "@LOGDIR@";') > lib/dirs.c.tmp
+        echo 'const char ovs_logdir[] = "@LOGDIR@";' && \
+        echo 'const char ovs_bindir[] = "$(bindir)";') > lib/dirs.c.tmp
        mv lib/dirs.c.tmp lib/dirs.c
 
 install-data-local:

diff --git a/lib/dirs.h b/lib/dirs.h
index c45054f5879d5604e22f2263eac256d18d3df624..966fd9ce3db56029b648448a95eba5792168d04a 100644 (file)
--- a/lib/dirs.h
+++ b/lib/dirs.h
@@ -37,5 +37,6 @@
 extern const char ovs_pkgdatadir[]; /* /usr/local/share/openvswitch */
 extern const char ovs_rundir[];     /* /usr/local/var/run */
 extern const char ovs_logdir[];     /* /usr/local/var/log */
+extern const char ovs_bindir[];     /* /usr/local/bin */
 
 #endif /* dirs.h */