use CONFIGDIR and STORAGEDIR in src/bluetoothd.8

diff --git a/configure.ac b/configure.ac
index 412fa22..7acad12 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -64,4 +64,5 @@ AC_OUTPUT([
        doc/Makefile
        doc/version.xml
        bluez.pc
+       src/bluetoothd.8
 ])

diff --git a/src/bluetoothd.8 b/src/bluetoothd.8.in
similarity index 87%
rename from src/bluetoothd.8
rename to src/bluetoothd.8.in
index 28c0398..a7ae77b 100644 (file)
--- a/src/bluetoothd.8
+++ b/src/bluetoothd.8.in
@@ -1,4 +1,4 @@
-.\" 
+.\"
 .TH "BLUETOOTHD" "8" "March 2004" "Bluetooth daemon" "System management commands"
 .SH "NAME"
 bluetoothd \- Bluetooth daemon
@@ -12,17 +12,17 @@ bluetoothd \- Bluetooth daemon
 .SH "DESCRIPTION"
 This manual page documents briefly the
 .B bluetoothd
-daemon, which manages all the Bluetooth devices. 
+daemon, which manages all the Bluetooth devices.
 .B bluetoothd
 itself does not accept many command\-line options, as most of its
-configuration is done in the 
-.B /etc/bluetooth/main.conf
+configuration is done in the
+.B @CONFIGDIR@/main.conf
 file, which has its own man page.
 .B bluetoothd
 can also provide a number of services via the D-Bus message bus
 system.
 .SH "OPTIONS"
-.TP 
+.TP
 .BI \-n
 Don't run as daemon in background.
 .TP
@@ -33,12 +33,12 @@ Enable debug information output.
 Use specific MTU size for SDP server.
 
 .SH "FILES"
-.TP 
-.I /etc/bluetooth/main.conf
+.TP
+.I @CONFIGDIR@/main.conf
 Default location of the global configuration file.
 
-.TP 
-.I /var/lib/bluetooth/nn:nn:nn:nn:nn:nn/linkkeys
+.TP
+.I @STORAGEDIR@/nn:nn:nn:nn:nn:nn/linkkeys
 Default location for link keys of paired devices. The directory
 \fInn\fP\fB:\fP\fInn\fP\fB:\fP\fInn\fP\fB:\fP\fInn\fP\fB:\fP\fInn\fP\fB:\fP\fInn\fP
 is the address of the local device. The file is line separated, with
@@ -50,8 +50,8 @@ the following columns separated by whitespace:
 
 \fIn\fP Link type integer.
 
-.TP 
-.I /var/lib/bluetooth/nn:nn:nn:nn:nn:nn/names
+.TP
+.I @STORAGEDIR@/nn:nn:nn:nn:nn:nn/names
 Default location for the device name cache. The directory
 \fInn\fP\fB:\fP\fInn\fP\fB:\fP\fInn\fP\fB:\fP\fInn\fP\fB:\fP\fInn\fP\fB:\fP\fInn\fP
 is the address of the local device. The file is line separated, with
@@ -61,8 +61,8 @@ the following columns separated by whitespace:
 
 \fIname\fP Remote device name, terminated with newline.
 
-.TP 
-.I /var/lib/bluetooth/nn:nn:nn:nn:nn:nn/features
+.TP
+.I @STORAGEDIR@/nn:nn:nn:nn:nn:nn/features
 Default location for the features cache. The directory
 \fInn\fP\fB:\fP\fInn\fP\fB:\fP\fInn\fP\fB:\fP\fInn\fP\fB:\fP\fInn\fP\fB:\fP\fInn\fP
 is the address of the local device. The file is line separated, with
@@ -72,8 +72,8 @@ the following columns separated by whitespace:
 
 \fInnnnnnnnnnnnnnnn\fP Remote device LMP features coded as an 8 byte bitfield.
 
-.TP 
-.I /var/lib/bluetooth/nn:nn:nn:nn:nn:nn/manufacturers
+.TP
+.I @STORAGEDIR@/nn:nn:nn:nn:nn:nn/manufacturers
 Default location for the manufacturers cache. The directory
 \fInn\fP\fB:\fP\fInn\fP\fB:\fP\fInn\fP\fB:\fP\fInn\fP\fB:\fP\fInn\fP\fB:\fP\fInn\fP
 is the address of the local device. The file is line separated, with