Adjust '/usr/local' pathnames for '/usr' prefix of the 'captive-static' build.

diff --git a/project/captive/man/captive-cmdline.pod.html b/project/captive/man/captive-cmdline.pod.html
index 9bd0c51..c055026 100644 (file)
--- a/project/captive/man/captive-cmdline.pod.html
+++ b/project/captive/man/captive-cmdline.pod.html
@@ -48,7 +48,7 @@ options:</p>
 <dd>
 Pathname to <strong>.sys</strong> or <strong>.so</strong> filesystem module file. You will use exactly
 once this option. Possible choices are
-<strong>/usr/local/var/lib/captive/ntfs.sys</strong>
+<strong>/var/lib/captive/ntfs.sys</strong>
 etc.
 </dd>
 <p></p>
@@ -57,7 +57,7 @@ etc.
 <dd>
 Pathname to any W32 module to load w/o initialization. Multiple modules can be
 loaded although in common case you will use just
-<strong>/usr/local/var/lib/captive/ntoskrnl.exe</strong>
+<strong>/var/lib/captive/ntoskrnl.exe</strong>
 here.
 </dd>
 <p></p>
@@ -120,7 +120,7 @@ Use of <strong>--syslog</strong> feature is not recommended in this case.
 </dt>
 <dd>
 Pathname to
-<strong>/usr/local/sbin/captive-sandbox-server</strong>
+<strong>/usr/sbin/captive-sandbox-server</strong>
 program, turns on sandboxing.
 You should always use this option in conjunction with <strong>--rw</strong>, see it for
 details. Although this program is <em>setuid root</em> and it drops it privileges
@@ -139,7 +139,7 @@ Option needs to be used by hand for the <strong>captive-cmdline</strong>(2) clie
 </dt>
 <dd>
 Specify <em>CORBA IOR</em> of
-<strong>/usr/local/sbin/captive-sandbox-server</strong>
+<strong>/usr/sbin/captive-sandbox-server</strong>
 program, turns on
 sandboxing. Specified <em>CORBA IOR</em> should be the string starting by ``<strong>IOR:</strong>''
 text. This option is useful only for debugging. No sandbox restarting is
@@ -150,7 +150,7 @@ possible in this case.
 </dt>
 <dd>
 Turn off sandboxing feature (default). No
-<strong>/usr/local/sbin/captive-sandbox-server</strong>
+<strong>/usr/sbin/captive-sandbox-server</strong>
 is run. Microsoft Windows filesystem driver is run in native UNIX environment
 without any <em>CORBA</em> separation. This option is recommended only for debugging.
 It is dangerous to use <strong>--rw</strong> together, see its description for the details.

diff --git a/project/captive/man/captive-install-acquire.pod.html b/project/captive/man/captive-install-acquire.pod.html
index 4776636..4fc51dc 100644 (file)
--- a/project/captive/man/captive-install-acquire.pod.html
+++ b/project/captive/man/captive-install-acquire.pod.html
@@ -37,7 +37,7 @@
 <p>Program acquires the needed <em>Microsoft Windows XP</em> driver files. Multiple
 methods of getting the driver files are supported. All the driver files are
 stored to the directory
-<strong>/usr/local/var/lib/captive/</strong>
+<strong>/var/lib/captive/</strong>
 where they are
 expected by <strong>mount.captive</strong>(8).</p>
 <p>
@@ -67,7 +67,7 @@ Display additional information during disks scanning.
 <dd>
 Perform all the operations but do not modify anything (no drivers are
 stored to
-<strong>/usr/local/var/lib/captive/</strong>
+<strong>/var/lib/captive/</strong>
 directory).
 </dd>
 <p></p>
@@ -75,11 +75,11 @@ directory).
 </dt>
 <dd>
 Path to <strong>.captivemodid.xml</strong> database (default:
-<strong>/usr/local/etc/w32-mod-id.captivemodid.xml</strong>). This file contains
+<strong>/etc/w32-mod-id.captivemodid.xml</strong>). This file contains
 identifications (<strong>md5sum</strong>(1)) of known compatible <em>Microsoft Windows XP</em>
 driver files. <strong>captive-install-acquire</strong>(1) will ignore any files not
 identified by this file although you may try to copy them to
-<strong>/usr/local/var/lib/captive/</strong>
+<strong>/var/lib/captive/</strong>
 manually for <strong>captive</strong>(7) clients.
 </dd>
 <p></p>

diff --git a/project/captive/man/captive.pod.html b/project/captive/man/captive.pod.html
index 317dfa4..0ad513a 100644 (file)
--- a/project/captive/man/captive.pod.html
+++ b/project/captive/man/captive.pod.html
@@ -47,7 +47,7 @@ options:</p>
 <dd>
 Pathname to <strong>.sys</strong> or <strong>.so</strong> filesystem module file. You will use exactly
 once this option. Possible choices are
-<strong>/usr/local/var/lib/captive/ntfs.sys</strong>
+<strong>/var/lib/captive/ntfs.sys</strong>
 etc.
 </dd>
 <p></p>
@@ -56,7 +56,7 @@ etc.
 <dd>
 Pathname to any W32 module to load w/o initialization. Multiple modules can be
 loaded although in common case you will use just
-<strong>/usr/local/var/lib/captive/ntoskrnl.exe</strong>
+<strong>/var/lib/captive/ntoskrnl.exe</strong>
 here.
 </dd>
 <p></p>
@@ -119,7 +119,7 @@ Use of <strong>--syslog</strong> feature is not recommended in this case.
 </dt>
 <dd>
 Pathname to
-<strong>/usr/local/sbin/captive-sandbox-server</strong>
+<strong>/usr/sbin/captive-sandbox-server</strong>
 program, turns on sandboxing.
 You should always use this option in conjunction with <strong>--rw</strong>, see it for
 details. Although this program is <em>setuid root</em> and it drops it privileges
@@ -138,7 +138,7 @@ Option needs to be used by hand for the <strong>captive-cmdline</strong>(2) clie
 </dt>
 <dd>
 Specify <em>CORBA IOR</em> of
-<strong>/usr/local/sbin/captive-sandbox-server</strong>
+<strong>/usr/sbin/captive-sandbox-server</strong>
 program, turns on
 sandboxing. Specified <em>CORBA IOR</em> should be the string starting by ``<strong>IOR:</strong>''
 text. This option is useful only for debugging. No sandbox restarting is
@@ -149,7 +149,7 @@ possible in this case.
 </dt>
 <dd>
 Turn off sandboxing feature (default). No
-<strong>/usr/local/sbin/captive-sandbox-server</strong>
+<strong>/usr/sbin/captive-sandbox-server</strong>
 is run. Microsoft Windows filesystem driver is run in native UNIX environment
 without any <em>CORBA</em> separation. This option is recommended only for debugging.
 It is dangerous to use <strong>--rw</strong> together, see its description for the details.

diff --git a/project/captive/man/lufs-captivefs.pod.html b/project/captive/man/lufs-captivefs.pod.html
index 558ddcf..03ba9ff 100644 (file)
--- a/project/captive/man/lufs-captivefs.pod.html
+++ b/project/captive/man/lufs-captivefs.pod.html
@@ -48,7 +48,7 @@ options:</p>
 <dd>
 Pathname to <strong>.sys</strong> or <strong>.so</strong> filesystem module file. You will use exactly
 once this option. Possible choices are
-<strong>/usr/local/var/lib/captive/ntfs.sys</strong>
+<strong>/var/lib/captive/ntfs.sys</strong>
 etc.
 </dd>
 <p></p>
@@ -57,7 +57,7 @@ etc.
 <dd>
 Pathname to any W32 module to load w/o initialization. Multiple modules can be
 loaded although in common case you will use just
-<strong>/usr/local/var/lib/captive/ntoskrnl.exe</strong>
+<strong>/var/lib/captive/ntoskrnl.exe</strong>
 here.
 </dd>
 <p></p>
@@ -120,7 +120,7 @@ Use of <strong>--syslog</strong> feature is not recommended in this case.
 </dt>
 <dd>
 Pathname to
-<strong>/usr/local/sbin/captive-sandbox-server</strong>
+<strong>/usr/sbin/captive-sandbox-server</strong>
 program, turns on sandboxing.
 You should always use this option in conjunction with <strong>--rw</strong>, see it for
 details. Although this program is <em>setuid root</em> and it drops it privileges
@@ -139,7 +139,7 @@ Option needs to be used by hand for the <strong>captive-cmdline</strong>(2) clie
 </dt>
 <dd>
 Specify <em>CORBA IOR</em> of
-<strong>/usr/local/sbin/captive-sandbox-server</strong>
+<strong>/usr/sbin/captive-sandbox-server</strong>
 program, turns on
 sandboxing. Specified <em>CORBA IOR</em> should be the string starting by ``<strong>IOR:</strong>''
 text. This option is useful only for debugging. No sandbox restarting is
@@ -150,7 +150,7 @@ possible in this case.
 </dt>
 <dd>
 Turn off sandboxing feature (default). No
-<strong>/usr/local/sbin/captive-sandbox-server</strong>
+<strong>/usr/sbin/captive-sandbox-server</strong>
 is run. Microsoft Windows filesystem driver is run in native UNIX environment
 without any <em>CORBA</em> separation. This option is recommended only for debugging.
 It is dangerous to use <strong>--rw</strong> together, see its description for the details.