summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcel Holtmann <marcel@holtmann.org>2004-08-09 08:01:36 +0000
committerMarcel Holtmann <marcel@holtmann.org>2004-08-09 08:01:36 +0000
commit71e6fca1e290bee72853bea6ea3768879d4510a7 (patch)
tree5602c97097764967feca81b5192f4905f39a1a03
parent93f7135d5885057d17bd599a5374053f3b1020e6 (diff)
Make use of CONFIGDIR
-rw-r--r--hcid/hcid.h8
-rw-r--r--rfcomm/parser.y2
2 files changed, 5 insertions, 5 deletions
diff --git a/hcid/hcid.h b/hcid/hcid.h
index 41b62419..a5074ffa 100644
--- a/hcid/hcid.h
+++ b/hcid/hcid.h
@@ -34,10 +34,10 @@
#include "glib-ectomy.h"
-#define HCID_CONFIG_FILE "/etc/bluetooth/hcid.conf"
-#define HCID_PIN_FILE "/etc/bluetooth/pin"
-#define HCID_KEY_FILE "/etc/bluetooth/link_key"
-#define HCID_PIN_HELPER "/bin/bluepin"
+#define HCID_CONFIG_FILE CONFIGDIR "/hcid.conf"
+#define HCID_PIN_FILE CONFIGDIR "/pin"
+#define HCID_KEY_FILE CONFIGDIR "/link_key"
+#define HCID_PIN_HELPER "/usr/bin/bluepin"
struct device_opts {
char *name;
diff --git a/rfcomm/parser.y b/rfcomm/parser.y
index 58bc74c0..1d5f9024 100644
--- a/rfcomm/parser.y
+++ b/rfcomm/parser.y
@@ -161,7 +161,7 @@ int rfcomm_read_config(char *filename)
snprintf(file, MAXPATHLEN, "%s/.bluetooth/rfcomm.conf", getenv("HOME"));
if ((getuid() == 0) || (access(file, R_OK) < 0))
- snprintf(file, MAXPATHLEN, "/etc/bluetooth/rfcomm.conf");
+ snprintf(file, MAXPATHLEN, "%s/rfcomm.conf", CONFIGDIR);
}
if (!(yyin = fopen(file, "r")))