Some further man tweaks

This fixes one non-defined @CUSTOM_@ entry, and replaces two hardcoded
paths with further configure-time variables.

Signed-off-by: Iustin Pop <iustin@google.com>
Reviewed-by: René Nussbaumer <rn@google.com>

Makefile.am

@@ -656,6 +656,8 @@ $(REPLACE_VARS_SED): Makefile
 	  echo 's#@CUSTOM_XEN_BOOTLOADER@#$(XEN_BOOTLOADER)#g'; \
 	  echo 's#@CUSTOM_XEN_KERNEL@#$(XEN_KERNEL)#g'; \
 	  echo 's#@CUSTOM_XEN_INITRD@#$(XEN_INITRD)#g'; \
+	  echo 's#@CUSTOM_IALLOCATOR_SEARCH_PATH@#$(IALLOCATOR_SEARCH_PATH)#g'; \
+	  echo 's#@CUSTOM_EXPORT_DIR@#$(EXPORT_DIR)#g'; \
 	  echo 's#@RPL_FILE_STORAGE_DIR@#$(FILE_STORAGE_DIR)#g'; \
 	  echo 's#@RPL_SSH_INITD_SCRIPT@#$(SSH_INITD_SCRIPT)#g'; \
 	  echo 's#@PKGLIBDIR@#$(pkglibdir)#g'; \

man/gnt-backup.rst

@@ -29,7 +29,7 @@ EXPORT
 
 Exports an instance to the target node. All the instance data and
 its configuration will be exported under the
-/srv/ganeti/export/*instance* directory on the target node.
+``@CUSTOM_EXPORT_DIR@/``*instance* directory on the target node.
 
 The ``--shutdown-timeout`` is used to specify how much time to wait
 before forcing the shutdown (xm destroy in xen, killing the kvm

man/gnt-instance.rst

@@ -435,14 +435,13 @@ If you do not want gnt-instance to wait for the disk mirror to be
 synced, use the ``--no-wait-for-sync`` option.
 
 The ``--file-storage-dir`` specifies the relative path under the
-cluster-wide file storage directory to store file-based disks. It
-is useful for having different subdirectories for different
+cluster-wide file storage directory to store file-based disks. It is
+useful for having different subdirectories for different
 instances. The full path of the directory where the disk files are
-stored will consist of cluster-wide file storage directory +
-optional subdirectory + instance name. Example:
-/srv/ganeti/file-storage/mysubdir/instance1.example.com. This
-option is only relevant for instances using the file storage
-backend.
+stored will consist of cluster-wide file storage directory + optional
+subdirectory + instance name. Example:
+``@RPL_FILE_STORAGE_DIR@``*/mysubdir/instance1.example.com*. This
+option is only relevant for instances using the file storage backend.
 
 The ``--file-driver`` specifies the driver to use for file-based
 disks. Note that currently these drivers work with the xen