fixup make distcheck

diff --git a/configure.ac b/configure.ac
index 70342fa581a6591b63e1db9ef4f37835b36a771c..0eef7b7923e3d370baf6e5e46524d4c62ce06679 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -104,7 +104,7 @@ esac
 # Checks for programs.
 #--------------------------------------------------------------------------
 
-# FIXIT-L` should not need AM_CONDITIONAL() here
+# FIXIT-L should not need AM_CONDITIONAL() here
 AC_CHECK_PROG(have_asciidoc,asciidoc,yes,no)
 
 AM_CONDITIONAL(MAKE_HTML_DOC, [test "x$have_asciidoc" = "xyes"])
@@ -114,10 +114,17 @@ AC_CHECK_PROG(have_dblatex,dblatex,yes,no)
 
 AM_CONDITIONAL(MAKE_PDF_DOC, [test "x$have_dblatex" = "xyes"])
 
-AC_CHECK_FILE($srcdir/doc/snort_manual.html, have_html_manual="yes", [ AC_CHECK_FILE($ac_confdir/doc/snort_manual.html, have_html_manual="yes") ] )
-AC_CHECK_FILE($srcdir/doc/snort_manual.pdf, have_pdf_manual="yes", [ AC_CHECK_FILE($ac_confdir/doc/snort_manual.pdf, have_pdf_manual="yes") ] )
-AC_CHECK_FILE($srcdir/doc/snort_manual.tgz, have_chunked_manual="yes", [ AC_CHECK_FILE($ac_confdir/doc/snort_manual.tgz, have_chunked_manual="yes") ] )
-AC_CHECK_FILE($srcdir/doc/images.tgz, have_images_manual="yes", [ AC_CHECK_FILE($ac_confdir/doc/images.tgz, have_images_manual="yes") ] )
+AC_CHECK_FILE($srcdir/doc/snort_manual.html, have_html_manual="yes", [
+    AC_CHECK_FILE($ac_confdir/doc/snort_manual.html, have_html_manual="yes") ] )
+
+AC_CHECK_FILE($srcdir/doc/snort_manual.pdf, have_pdf_manual="yes", [
+    AC_CHECK_FILE($ac_confdir/doc/snort_manual.pdf, have_pdf_manual="yes") ] )
+
+AC_CHECK_FILE($srcdir/doc/snort_manual.tgz, have_chunked_manual="yes", [ 
+    AC_CHECK_FILE($ac_confdir/doc/snort_manual.tgz, have_chunked_manual="yes") ] )
+
+AC_CHECK_FILE($srcdir/doc/images.tgz, have_images_manual="yes", [
+    AC_CHECK_FILE($ac_confdir/doc/images.tgz, have_images_manual="yes") ] )
 
 AM_CONDITIONAL(HAVE_HTML_DOC, [test "x$have_html_manual" = "xyes"])
 AM_CONDITIONAL(HAVE_PDF_DOC, [test "x$have_pdf_manual" = "xyes"])

diff --git a/doc/Makefile.am b/doc/Makefile.am
index b5b596398607dce33ea6c70e93bfc43dc0101a1e..fa67fc630877ddf24b127b2071ef9faf9322ad03 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -63,7 +63,6 @@ snort_manual.pdf
 endif
 
 else
-
 if HAVE_HTML_DOC
 MANUALS += snort_manual.html
 endif
@@ -81,7 +80,6 @@ MANUALS += images.tgz
 endif
 endif
 
-
 doc_DATA = $(MANUALS)
 dist_doc_DATA += $(EXTRA_DIST)
 
@@ -181,7 +179,6 @@ html_args = \
     --attribute disable-javascript --attribute quirks! \
        $(pdf_args)
 
-
 if MAKE_HTML_DOC
 # this is the docbook approach to html
 #snort_manual.html: snort_manual.txt $(all_sources)
@@ -205,26 +202,27 @@ images.tgz: images/
         .
 
 if MAKE_PDF_DOC
-
 snort_manual.pdf: snort_manual.txt $(all_sources)
        a2x -f pdf $(pdf_args) $<
-
 endif
 endif
 
 if MAKE_HTML_DOC
-
 install-data-hook:
-       tar -xvf $(docdir)/snort_manual.tgz && mv snort_manual.chunked $(docdir)
+       mkdir $(DESTDIR)$(docdir)/snort_manual && \
+               tar zxvf $(srcdir)/snort_manual.tgz -C $(DESTDIR)$(docdir)/snort_manual
 
 else
 if HAVE_CHUNKED_DOC
 install-data-hook:
-       tar -xf $(docdir)/snort_manual.tgz && mv snort_manual.chunked $(docdir)
-
+       mkdir $(DESTDIR)$(docdir)/snort_manual && \
+               tar zxvf $(srcdir)/snort_manual.tgz -C $(DESTDIR)$(docdir)/snort_manual
 endif
 endif
 
+uninstall-hook:
+       rm -rf $(DESTDIR)$(docdir)/snort_manual
+
 delete_unbuilt = $(if $(and $(findstring $(builddir),$(srcdir)),$(findstring $(srcdir),$(builddir))), ,$(unbuilt_sources))
 
 clean-local:
@@ -234,3 +232,4 @@ clean-local:
        rm -f snort_manual.{fo,xml,html,pdf}
        rm -rf snort_manual.chunked/
        rm -f *.css
+