From e9f0331b230afa3003a4867ed455365e1d6b458f Mon Sep 17 00:00:00 2001 From: Marvin Scholz Date: Thu, 19 Oct 2017 11:37:26 +0200 Subject: [PATCH] doc: Remove unnecessary Makefiles --- configure.ac | 28 +++++++++++++++++++++++----- doc/Makefile.am | 2 +- 2 files changed, 24 insertions(+), 6 deletions(-) diff --git a/configure.ac b/configure.ac index f4fc50c8..107300d6 100644 --- a/configure.ac +++ b/configure.ac @@ -193,11 +193,29 @@ AC_SUBST(ICECAST_OPTIONAL) AC_SUBST(HAVE_KATE) AC_SUBST(KATE_LIBS) -AC_OUTPUT([Makefile conf/Makefile src/Makefile src/common/avl/Makefile -src/common/httpp/Makefile src/common/thread/Makefile src/common/log/Makefile -src/common/net/Makefile src/common/timing/Makefile doc/Makefile web/Makefile -web/assets/Makefile web/assets/css/Makefile web/assets/font/Makefile -admin/Makefile admin/includes/Makefile win32/Makefile examples/Makefile tests/Makefile]) +AC_CONFIG_FILES([ + Makefile + conf/Makefile + src/Makefile + src/common/avl/Makefile + src/common/httpp/Makefile + src/common/thread/Makefile + src/common/log/Makefile + src/common/net/Makefile + src/common/timing/Makefile + doc/Makefile + web/Makefile + web/assets/Makefile + web/assets/css/Makefile + web/assets/font/Makefile + admin/Makefile + admin/includes/Makefile + win32/Makefile + examples/Makefile + tests/Makefile +]) + +AC_OUTPUT echo " Icecast configuration diff --git a/doc/Makefile.am b/doc/Makefile.am index b92e4f2f..9d2db1d1 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -1,6 +1,6 @@ ## Process this file with automake to produce Makefile.in -AUTOMAKE_OPTIONS = foreign +docdir = $(datadir)/doc/$(PACKAGE) docdir = $(datadir)/doc/icecast nobase_doc_DATA = index.html \