dirs: Make sysconfdir available via ovs_sysconfdir().

This will be used in upcoming patches.

diff --git a/lib/automake.mk b/lib/automake.mk
index 8d93c7a1d5460c5ca69c1f717cd791fbc7c7d1ac..d55465bb60d0e51d5c6a7a3d7328ff5ff1f7a518 100644 (file)
--- a/lib/automake.mk
+++ b/lib/automake.mk
@@ -263,6 +263,7 @@ lib/dirs.c: lib/dirs.c.in Makefile
                -e 's,[@]LOGDIR[@],"$(LOGDIR)",g' \
                -e 's,[@]RUNDIR[@],"$(RUNDIR)",g' \
                -e 's,[@]bindir[@],"$(bindir)",g' \
+               -e 's,[@]sysconfdir[@],"$(sysconfdir)",g' \
                -e 's,[@]pkgdatadir[@],"$(pkgdatadir)",g') \
             > lib/dirs.c.tmp
        mv lib/dirs.c.tmp lib/dirs.c

diff --git a/lib/dirs.c.in b/lib/dirs.c.in
index a174ab386da111544cf7f3ccce8e3f286b106c0f..5b6b8748a1fe5fb2c7201ca34143f940aef8291b 100644 (file)
--- a/lib/dirs.c.in
+++ b/lib/dirs.c.in
@@ -1,6 +1,6 @@
 #line 2 "@srcdir@/lib/dirs.c.in"
 /*
- * Copyright (c) 2008, 2009, 2010 Nicira Networks.
+ * Copyright (c) 2008, 2009, 2010, 2011 Nicira Networks.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -37,6 +37,13 @@ get_dir(struct directory *d)
     return d->value;
 }
 
+const char *
+ovs_sysconfdir(void)
+{
+    static struct directory d = { NULL, @sysconfdir@, "OVS_SYSCONFDIR" };
+    return get_dir(&d);
+}
+
 const char *
 ovs_pkgdatadir(void)
 {

diff --git a/lib/dirs.h b/lib/dirs.h
index 30353059806114928789eb06076100b4cfcaba83..57107ff5029f6cf943326606155526f4fc5c5cc0 100644 (file)
--- a/lib/dirs.h
+++ b/lib/dirs.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2009, 2010 Nicira Networks.
+ * Copyright (c) 2008, 2009, 2010, 2011 Nicira Networks.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,6 +17,7 @@
 #ifndef DIRS_H
 #define DIRS_H 1
 
+const char *ovs_sysconfdir(void); /* /usr/local/etc */
 const char *ovs_pkgdatadir(void); /* /usr/local/share/openvswitch */
 const char *ovs_rundir(void);     /* /usr/local/var/run/openvswitch */
 const char *ovs_logdir(void);     /* /usr/local/var/log/openvswitch */