diff options
author | Max Kellermann <max@duempel.org> | 2011-09-16 07:52:39 +0200 |
---|---|---|
committer | Max Kellermann <max@duempel.org> | 2011-09-16 07:52:39 +0200 |
commit | 87b624f5d5233af1727b683c6ace1e957d837ed4 (patch) | |
tree | 98b18a6e20721b9b9063779d7bc0b38457dffe43 /Makefile.am | |
parent | e1efc71ad3389ef8b2bdcf8dba5dc124c9a5bf7f (diff) | |
parent | 443e96381a0e24d9c22578ba6f7fb96de1814994 (diff) | |
download | mpd-87b624f5d5233af1727b683c6ace1e957d837ed4.tar.gz mpd-87b624f5d5233af1727b683c6ace1e957d837ed4.tar.xz mpd-87b624f5d5233af1727b683c6ace1e957d837ed4.zip |
Merge branch 'v0.16.x'
Diffstat (limited to 'Makefile.am')
-rw-r--r-- | Makefile.am | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index e6f681766..41b905be9 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,7 +1,7 @@ ACLOCAL_AMFLAGS = -I m4 AUTOMAKE_OPTIONS = foreign 1.10 dist-bzip2 subdir-objects -AM_CPPFLAGS = -I$(srcdir)/src $(GLIB_CFLAGS) +AM_CPPFLAGS += -I$(srcdir)/src $(GLIB_CFLAGS) AM_CPPFLAGS += -DSYSTEM_CONFIG_FILE_LOCATION='"$(sysconfdir)/mpd.conf"' |