sockets documentation and cleanup

[chaz/yoink] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index ad016214c452aa207672d9271eff38fafa7d7257..cc0d5323aec3626cb573a08dd63a2cde036ce72c 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,12 +1,13 @@
 
 ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS = data doc src
+SUBDIRS = data src
+EXTRA_DIST = autogen.sh doc
 
-EXTRA_DIST = autogen.sh
+man6_MANS = doc/yoink.6
 
 
-.PHONY: run debug docs portable installer
+.PHONY: run debug portable installer package
 
 if WIN32
 
@@ -14,10 +15,14 @@ portable: all
        $(SH) arch/win32/makepackage.sh -p $(prefix) -d "@DATA_FILES@" \
                -s $(STRIP) -V $(VERSION)
 
+if HAVE_MAKENSIS
+
 installer: all
        $(SH) arch/win32/makepackage.sh -p $(prefix) -d "@DATA_FILES@" \
                -s $(STRIP) -V $(VERSION) -i $(MAKENSIS)
 
+endif
+
 else
 
 run: all
@@ -35,6 +40,3 @@ package: all
 
 endif
 
-docs:
-       $(DOXYGEN)
-