More fixes for distcheck target

Author: sgeto

.travis.yml

@@ -12,7 +12,7 @@ os:
   - linux
   - osx
 before_install:
-    - if [ ${TRAVIS_OS_NAME} = "linux" ]; then sudo apt-get update -qq; sudo apt-get install -y autoconf automake m4 libtool doxygen doxygen-latex liblua5.1-0-dev libdumbnet-dev; fi
+    - if [ ${TRAVIS_OS_NAME} = "linux" ]; then sudo apt-get update -qq; sudo apt-get install -qq autoconf automake m4 libtool doxygen doxygen-latex liblua5.1-0-dev libdumbnet-dev; fi
     - if [ ${TRAVIS_OS_NAME} = "osx" ]; then brew update; brew install doxygen lua@5.1 libdnet; fi
 install:  cd libnet && ../Prepare && ../Build
 after_success:

libnet/Makefile.am

@@ -6,9 +6,9 @@
 # Process this file with automake to produce a Makefile.in script.
 
 
-DISTCHECK_CONFIGURE_FLAGS = \
-           --enable-doxygen-doc \
-           --disable-samples
+#DISTCHECK_CONFIGURE_FLAGS = \
+#           --enable-doxygen-doc \
+#           --disable-samples
 
 # Include macros implemented in the directory m4
 ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
@@ -62,12 +62,12 @@ APIDOCS       = $(top_srcdir)/doc/api/*.html \
                 $(top_srcdir)/doc/api/*.css \
                 $(top_srcdir)/doc/api/*.png
 
-APIDOC_DEPS   = doc/libnet.doxygen.conf \
-                doc/libnet.Pod \
-                doc/libnet-config.Pod \
-                doc/libnet_api_header.html_tmpl \
-                doc/libnet_api_footer.html_tmpl \
-                doc/libnet_api_stylesheet.css_tmpl
+APIDOC_DEPS   = $(top_srcdir)/doc/libnet.doxygen.conf \
+                $(top_srcdir)/doc/libnet.Pod \
+                $(top_srcdir)/doc/libnet-config.Pod \
+                $(top_srcdir)/doc/libnet_api_header.html_tmpl \
+                $(top_srcdir)/doc/libnet_api_footer.html_tmpl \
+                $(top_srcdir)/doc/libnet_api_stylesheet.css_tmpl
 
 dist_doc_DATA = doc/CHANGELOG \
                 doc/CONTRIB \

libnet/configure.ac

@@ -188,7 +188,7 @@ DX_RTF_FEATURE(OFF)
 DX_XML_FEATURE(OFF)
 DX_PDF_FEATURE(ON)
 DX_PS_FEATURE(OFF)
-DX_INIT_DOXYGEN(${PACKAGE_NAME}, [doc/libnet.doxygen.conf], [doc])
+DX_INIT_DOXYGEN(${PACKAGE_NAME}, [${ac_top_srcdir}/doc/libnet.doxygen.conf], [doc])
 AM_CONDITIONAL(ENABLE_DOXYGEN,[test "x${DX_FLAG_doc}" = x1])
 
 if test ${DX_FLAG_doc} -eq 1; then