2 files changed, 8 insertions, 3 deletions
diff --git a/autogen.sh b/autogen.sh
index c6d51e5..7af4389 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -3,10 +3,9 @@
 echo 'Generating necessary files...'
 rm -rf config
 mkdir -p config
-# Mac
-if [ -x "`which glibtoolize`" ]; then
+if [ -x "`which glibtoolize`" ]; then # OSX
 	glibtoolize --force
-else
+else # Unix
 	libtoolize --force
 fi
 aclocal
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 33cb830..0b2eae3 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -6,6 +6,12 @@ dist_man_MANS = \
 	man/man3/slv2_util.3 \
 	man/man3/slv2_world.3
 
+if HAVE_DOXYGEN
+	man_MANS = $(dist_man_MANS)
+else
+	man_mans =
+endif
+
 EXTRA_DIST = mainpage.dox reference.doxygen.in $(man_MANS)
 
 %.3: