need to put a Makefile in doc directory, so that

man pages and such are installed in the proper place

git-svn-id: https://svn.musicpd.org/ncmpc/trunk@491 09075e82-0dd4-0310-85a5-a0d7c8717e4f

diff --git a/Makefile.am b/Makefile.am
index ad37bb81e027b44fbcbf513bdb3557de748b1b3c..849ab0637cdab9a4d4edf65c262fa519af693c91 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,11 +3,12 @@
 #
 
 bin_PROGRAMS = ncmpc
-man_MANS = doc/ncmpc.1
 pkgdata_DATA =
 docdir = $(prefix)/share/doc/$(PACKAGE)
-doc_DATA = AUTHORS README ChangeLog doc/ncmpcrc
-EXTRA_DIST = COPYING $(pkgdata_DATA) $(man_MANS) $(doc_DATA)
+doc_DATA = AUTHORS README ChangeLog
+EXTRA_DIST = COPYING $(pkgdata_DATA) $(doc_DATA)
+
+SUBDIRS = doc
 
 ncmpc_headers = libmpdclient.h mpc.h options.h conf.h command.h screen.h \
               screen_utils.h screen_play.h screen_file.h screen_search.h \

diff --git a/configure.ac b/configure.ac
index 531cc3b29c61b78e973d853d4d62698433522a7a..edd6760f69120a05c25c507ffcc0ec891a71f5a3 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -110,7 +110,7 @@ AC_DEFINE_UNQUOTED(DEFAULT_CHARSET,  "$DEFAULT_CHARSET", Default charset)
 
 AM_CONFIG_HEADER(config.h)
 
-AC_OUTPUT(Makefile)
+AC_OUTPUT(doc/Makefile Makefile)
 
 echo "
 Configuration: