[pisa-src] r1042 - in trunk: . include
- From: Diego Biurrun <diego@xxxxxxxxxx>
- To: pisa-src@xxxxxxxxxxxxx
- Date: Wed, 07 Oct 2009 19:12:09 +0200
Author: biurrun
Date: Wed Oct 7 19:12:09 2009
New Revision: 1042
Log:
Fix configuration file installation: Configuration files need to appear in a
separate subdirectory of the system configuration directory.
This had previously been broken after removing the hardcoded configuration
directory settings from the code and build system.
Modified:
trunk/configure.ac
trunk/include/global.h
Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac Wed Oct 7 18:36:00 2009 (r1041)
+++ trunk/configure.ac Wed Oct 7 19:12:09 2009 (r1042)
@@ -197,6 +197,10 @@
prefix="$ac_default_prefix"
fi
+
+# Our configuration files should be located in a subdirectory of their own.
+AC_SUBST(sysconfdir, ${sysconfdir}/pisa)
+
AC_DEFINE_UNQUOTED(PISA_SYSCONFDIR, "$(eval echo $sysconfdir)")
AH_TEMPLATE([PISA_SYSCONFDIR])
Modified: trunk/include/global.h
==============================================================================
--- trunk/include/global.h Wed Oct 7 18:36:00 2009 (r1041)
+++ trunk/include/global.h Wed Oct 7 19:12:09 2009 (r1042)
@@ -162,9 +162,9 @@
*/
#define PATH_PROCNET_DEV "/proc/net/dev"
#define PATH_PROCNET_ROUTE "/proc/net/route"
-#define PISA_CONFDIR_PATH PISA_SYSCONFDIR"/pisa/"
+#define PISA_CONFDIR_PATH PISA_SYSCONFDIR
#define PISA_RESOLVCONF_PATH "/etc/resolv.conf"
-#define PISA_DIR_PERF_RESULTS PISA_SYSCONFDIR"/pisa/results"
+#define PISA_DIR_PERF_RESULTS PISA_SYSCONFDIR"/results"
#define PISACD_CONFFILE "pisacd.conf"
#define PISACD_CONFFILE_FULLPATH PISA_CONFDIR_PATH PISACD_CONFFILE
Other related posts:
- » [pisa-src] r1042 - in trunk: . include - Diego Biurrun
