aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Brown <rbrown@exherbo.org>2008-10-14 18:32:46 +0200
committerMax Kellermann <max@duempel.org>2008-10-14 18:32:46 +0200
commit50e038d1ef339b80154afd32cd78b73656e6bdc6 (patch)
treebd5c1e1c377fd84a2dc2c836447c6c46f98aa460
parentda1c0cd6d7c9202f70ac63c96276e58499334062 (diff)
downloadmpd-50e038d1ef339b80154afd32cd78b73656e6bdc6.tar.gz
mpd-50e038d1ef339b80154afd32cd78b73656e6bdc6.tar.xz
mpd-50e038d1ef339b80154afd32cd78b73656e6bdc6.zip
Makefile.am: don't override $(docdir)
Makefile.am sets docdir = $(prefix)/share/doc/$(PACKAGE). This overrides the setting specified in ./configure --docdir.
-rw-r--r--Makefile.am1
-rw-r--r--doc/Makefile.am1
2 files changed, 0 insertions, 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)