Add install_system_dirs makefile target.

Add configure options for system and locking directories.

4 files changed, 14 insertions, 14 deletions

diff --git a/man/Makefile.in b/man/Makefile.in
index 9b538410..eef1982a 100644
--- a/man/Makefile.in
+++ b/man/Makefile.in
@@ -67,7 +67,7 @@ $(MAN5) $(MAN8) $(MAN8CLUSTER):	Makefile
 %: %.in
 	@case "$@" in \
 	  */*) ;; \
-	  *) echo "Creating $@" ; $(SED) -e "s/#VERSION#/$(LVM_VERSION)/" $< > $@ ;; \
+	  *) echo "Creating $@" ; $(SED) -e "s+#VERSION#+$(LVM_VERSION)+;s+#DEFAULT_SYS_DIR#+$(DEFAULT_SYS_DIR)+;s+#DEFAULT_ARCHIVE_DIR#+$(DEFAULT_ARCHIVE_DIR)+;s+#DEFAULT_BACKUP_DIR#+$(DEFAULT_BACKUP_DIR)+;s+#DEFAULT_CACHE_DIR#+$(DEFAULT_CACHE_DIR)+;s+#DEFAULT_LOCK_DIR#+$(DEFAULT_LOCK_DIR)+" $< > $@ ;; \
 	esac
 
 install_man5: $(MAN5)
diff --git a/man/lvm.8.in b/man/lvm.8.in
index 1e016f77..e38ce4f4 100644
--- a/man/lvm.8.in
+++ b/man/lvm.8.in
@@ -254,7 +254,7 @@ satisfy allocation attempts.
 \fBLVM_SYSTEM_DIR\fP 
 Directory containing lvm.conf and other LVM
 system files.
-Defaults to "/etc/lvm".
+Defaults to "#DEFAULT_SYS_DIR#".
 .TP
 \fBHOME\fP 
 Directory containing .lvm_history if the internal readline shell
@@ -277,7 +277,7 @@ A LV cannot be called '.' '..' 'snapshot' or 'pvmove'. The LV name may also not
 .SH DIAGNOSTICS
 All tools return a status code of zero on success or non-zero on failure.
 .SH FILES
-.I /etc/lvm/lvm.conf
+.I #DEFAULT_SYS_DIR#/lvm.conf
 .br
 .I $HOME/.lvm_history
 .SH SEE ALSO
diff --git a/man/lvm.conf.5.in b/man/lvm.conf.5.in
index 9cc05e8a..02ebb2a0 100644
--- a/man/lvm.conf.5.in
+++ b/man/lvm.conf.5.in
@@ -2,7 +2,7 @@
 .SH NAME
 lvm.conf \- Configuration file for LVM2
 .SH SYNOPSIS
-.B /etc/lvm/lvm.conf
+.B #DEFAULT_SYS_DIR#/lvm.conf
 .SH DESCRIPTION
 lvm.conf is loaded during the initialisation phase of 
 \fBlvm\fP (8).  This file can in turn lead to other files
@@ -105,7 +105,7 @@ As an example, to ignore /dev/cdrom you could use:
 \fBdevices { filter=["r|cdrom|"] }\fP 
 .IP
 \fBcache_dir\fP \(em Persistent filter cache file directory.
-Defaults to "/etc/lvm/cache".
+Defaults to "#DEFAULT_CACHE_DIR#".
 .IP
 \fBwrite_cache_state\fP \(em Set to 0 to disable the writing out of the 
 persistent filter cache file when \fBlvm\fP exits.
@@ -206,12 +206,12 @@ in low memory situations this setting can cause your machine to lock up.
 .IP
 \fBarchive_dir\fP \(em Directory used for automatic metadata archives.
 Backup copies of former metadata for each volume group are archived here.
-Defaults to "/etc/lvm/archive".
+Defaults to "#DEFAULT_ARCHIVE_DIR#".
 .IP
 \fBbackup_dir\fP \(em Directory used for automatic metadata backups.
 A single backup copy of the current metadata for each volume group 
 is stored here.
-Defaults to "/etc/lvm/backup".
+Defaults to "#DEFAULT_BACKUP_DIR#".
 .IP
 \fBarchive\fP \(em Whether or not tools automatically archive existing
 metadata into \fBarchive_dir\fP before making changes to it.
@@ -420,11 +420,11 @@ important never to edit these metadata files unless you fully
 understand how things work: to make changes you should always use 
 the tools as normal, or else vgcfgbackup, edit backup, vgcfgrestore.
 .SH FILES
-.I /etc/lvm/lvm.conf
-.I /etc/lvm/archive
-.I /etc/lvm/backup
-.I /etc/lvm/cache/.cache
-.I /var/lock/lvm
+.I #DEFAULT_SYS_DIR#/lvm.conf
+.I #DEFAULT_ARCHIVE_DIR#
+.I #DEFAULT_BACKUP_DIR#
+.I #DEFAULT_CACHE_DIR#/.cache
+.I #DEFAULT_LOCK_DIR#
 .SH SEE ALSO
 .BR lvm (8),
 .BR umask (2),
diff --git a/man/vgcfgbackup.8.in b/man/vgcfgbackup.8.in
index 6eb25c22..1a72a015 100644
--- a/man/vgcfgbackup.8.in
+++ b/man/vgcfgbackup.8.in
@@ -18,13 +18,13 @@ If you don't name any volume groups on the command line, all of them
 will be backed up.
 .sp
 In a default installation, each volume group gets backed up into a separate
-file bearing the name of the volume group in the directory /etc/lvm/backup.
+file bearing the name of the volume group in the directory #DEFAULT_BACKUP_DIR#.
 You can write the backup to an alternative file using -f.  In this case
 if you are backing up more than one volume group the filename is
 treated as a template, and %s gets replaced by the volume group name.
 .sp
 NB. This DOESN'T backup user/system data in logical
-volume(s)!  Backup /etc/lvm regularly too.
+volume(s)!  Backup #DEFAULT_SYS_DIR# regularly too.
 .SH OPTIONS
 See \fBlvm\fP for common options.
 .SH SEE ALSO