From 50e038d1ef339b80154afd32cd78b73656e6bdc6 Mon Sep 17 00:00:00 2001 From: Richard Brown Date: Tue, 14 Oct 2008 18:32:46 +0200 Subject: Makefile.am: don't override $(docdir) Makefile.am sets docdir = $(prefix)/share/doc/$(PACKAGE). This overrides the setting specified in ./configure --docdir. --- Makefile.am | 1 - doc/Makefile.am | 1 - 2 files changed, 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index 03454230f..1246144f4 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2,7 +2,6 @@ ACLOCAL_AMFLAGS = -I m4 AUTOMAKE_OPTIONS = foreign 1.6 SUBDIRS = src doc -docdir = $(prefix)/share/doc/$(PACKAGE) doc_DATA = README UPGRADING EXTRA_DIST = COPYING $(doc_DATA) m4 autogen.sh bs build.mk scripts .gitignore diff --git a/doc/Makefile.am b/doc/Makefile.am index 4fe260180..9cba2f08a 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -1,4 +1,3 @@ man_MANS = mpd.1 mpd.conf.5 -docdir = $(prefix)/share/doc/$(PACKAGE) doc_DATA = COMMANDS mpdconf.example EXTRA_DIST = $(man_MANS) $(doc_DATA) -- cgit v1.2.3