From b2839540d6b93c682b30ec3b15b011e08edaa1d2 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Thu, 16 Oct 2008 15:00:02 +0200 Subject: Makefile.am: fix automake 1.6 errors When building with the ancient automake 1.6 version, the following errors occur: Makefile.am:5: invalid variable `doc_DATA' doc/Makefile.am:2: invalid variable `doc_DATA' This patches renames some internal variables. --- Makefile.am | 4 ++-- doc/Makefile.am | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Makefile.am b/Makefile.am index eb346693f..3b101edb2 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2,8 +2,8 @@ ACLOCAL_AMFLAGS = -I m4 AUTOMAKE_OPTIONS = foreign 1.6 SUBDIRS = src doc -doc_DATA = README UPGRADING -EXTRA_DIST = COPYING $(doc_DATA) m4 autogen.sh scripts .gitignore +docs = README UPGRADING +EXTRA_DIST = COPYING $(docs) m4 autogen.sh scripts .gitignore sparse-check test: $(MAKE) -C src $@ diff --git a/doc/Makefile.am b/doc/Makefile.am index 9cba2f08a..8af678d38 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -1,3 +1,3 @@ -man_MANS = mpd.1 mpd.conf.5 -doc_DATA = COMMANDS mpdconf.example -EXTRA_DIST = $(man_MANS) $(doc_DATA) +manpages = mpd.1 mpd.conf.5 +docs = COMMANDS mpdconf.example +EXTRA_DIST = $(manpages) $(docs) -- cgit v1.2.3