Revert "Workaround man page output for long PREFIX dirs"

This reverts commit 83d9f436.

man is still unable to wrap some long lines, so we simply revert this patch
(and filter out the specific message in autotools/check-man).

Signed-off-by: Iustin Pop <iustin@google.com>
Reviewed-by: Michael Hanselmann <hansmi@google.com>

Makefile.am

@@ -16,7 +16,6 @@ RUN_IN_TEMPDIR = $(top_srcdir)/autotools/run-in-tempdir
 CHECK_PYTHON_CODE = $(top_srcdir)/autotools/check-python-code
 CHECK_MAN = $(top_srcdir)/autotools/check-man
 REPLACE_VARS_SED = autotools/replace_vars.sed
-REPLACE_VARS_MAN = autotools/replace_vars.man
 
 hypervisordir = $(pkgpythondir)/hypervisor
 httpdir = $(pkgpythondir)/http
@@ -58,8 +57,7 @@ maintainer-clean-local:
 	rm -rf doc/api doc/html
 
 CLEANFILES = \
-	$(REPLACE_VARS_SED) \
-	$(REPLACE_VARS_MAN) \
+	autotools/replace_vars.sed \
 	daemons/daemon-util \
 	daemons/ganeti-cleaner \
 	devel/upload \
@@ -404,12 +402,12 @@ man/%.html.in: man/%.sgml man/footer.sgml $(DOCBOOK_WRAPPER)
 	  { echo 'docbook2html' not found during configure; exit 1; }
 	$(DOCBOOK_WRAPPER) "$(DOCBOOK2HTML) --nochunks" $< $(notdir $(@:.in=)) $@
 
-man/%.7: man/%.7.in $(REPLACE_VARS_MAN)
-	sed -f $(REPLACE_VARS_MAN) < $< > $@
+man/%.7: man/%.7.in $(REPLACE_VARS_SED)
+	sed -f $(REPLACE_VARS_SED) < $< > $@
 	$(CHECK_MAN) $@
 
-man/%.8: man/%.8.in $(REPLACE_VARS_MAN)
-	sed -f $(REPLACE_VARS_MAN) < $< > $@
+man/%.8: man/%.8.in $(REPLACE_VARS_SED)
+	sed -f $(REPLACE_VARS_SED) < $< > $@
 	$(CHECK_MAN) $@
 
 man/%.html: man/%.html.in $(REPLACE_VARS_SED)
@@ -474,9 +472,6 @@ $(REPLACE_VARS_SED): Makefile
 	  echo 's#@PKGLIBDIR@#$(pkglibdir)#g'; \
 	} > $@
 
-$(REPLACE_VARS_MAN): $(REPLACE_VARS_SED)
-	sed -e 's^/^\0\\\\:^g' < $^ >$@
-
 # We need to create symlinks because "make distcheck" will not install Python
 # files when building.
 stamp-srclinks: Makefile stamp-directories

man/ganeti-cleaner.sgml

@@ -49,12 +49,11 @@
     </para>
 
     <para>
-      <command>&dhpackage;</command> automatically removes all files
-      older than 21 days from the archive located at:
+      <command>&dhpackage;</command> automatically removes all files older than
+      21 days from
+      <filename>@LOCALSTATEDIR@/lib/ganeti/queue/archive</filename>.
     </para>
 
-    <literallayout>@LOCALSTATEDIR@/lib/ganeti/queue/archive</literallayout>
-
   </refsect1>
 
   &footer;

man/ganeti-watcher.sgml

@@ -66,21 +66,17 @@
     <para>
       The watcher does synchronous queries but will submit jobs for
       executing the changes. Due to locking, it could be that the jobs
-      execute much later than the watcher schedules them.
+      execute much later than the watcher executes them.
     </para>
 
-    <para>The command has a state file located at</para>
-
-    <literallayout>@LOCALSTATEDIR@/lib/ganeti/watcher.data</literallayout>
-
-    <para>and a log file at</para>
-
-    <literallayout>@LOCALSTATEDIR@/log/ganeti/watcher.log</literallayout>
-
     <para>
-      Removal of either file will not affect correct operation; the
-      removal of the state file will just cause the restart counters
-      for the instances to reset to zero.
+      The command has a state file located at
+      <filename>@LOCALSTATEDIR@/lib/ganeti/watcher.data</filename> and a log
+      file at
+      <filename>@LOCALSTATEDIR@/log/ganeti/watcher.log</filename>. Removal of
+      either file will not affect correct operation; the removal of
+      the state file will just cause the restart counters for the
+      instances to reset to zero.
     </para>
 
   </refsect1>