Updated Branches: refs/heads/master a6067e19b -> 00b885657
TS-2207: stop using $(builddir) in automake Older automake (< 1.9?) doesn't emit $(builddir), but it's always "." anyway, so let's use that instead. Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/00b88565 Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/00b88565 Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/00b88565 Branch: refs/heads/master Commit: 00b8856578ec733ae7dea76ade43efe44b6a8e69 Parents: a6067e1 Author: James Peach <jpe...@apache.org> Authored: Tue Sep 10 09:20:27 2013 -0700 Committer: James Peach <jpe...@apache.org> Committed: Tue Sep 10 09:21:42 2013 -0700 ---------------------------------------------------------------------- lib/tsconfig/Makefile.am | 2 +- proxy/Makefile.am | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/00b88565/lib/tsconfig/Makefile.am ---------------------------------------------------------------------- diff --git a/lib/tsconfig/Makefile.am b/lib/tsconfig/Makefile.am index dde552f..4e33c6c 100644 --- a/lib/tsconfig/Makefile.am +++ b/lib/tsconfig/Makefile.am @@ -53,4 +53,4 @@ test_tsconfig_LDADD = libtsconfig.la ../ts/libtsutil.la # Strip to just the enum in the ts::config namespace so we can use # it more easily in C++. TsConfigGrammar.hpp: TsConfigGrammar.h BisonHeaderToC++.sed - $(SED) -f $(srcdir)/BisonHeaderToC++.sed $(builddir)/TsConfigGrammar.h > $@ + $(SED) -f $(srcdir)/BisonHeaderToC++.sed TsConfigGrammar.h > $@ http://git-wip-us.apache.org/repos/asf/trafficserver/blob/00b88565/proxy/Makefile.am ---------------------------------------------------------------------- diff --git a/proxy/Makefile.am b/proxy/Makefile.am index d26227e..2565100 100644 --- a/proxy/Makefile.am +++ b/proxy/Makefile.am @@ -50,8 +50,8 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/mgmt/preparse \ -I$(top_srcdir)/mgmt/utils \ -I$(srcdir)/api/ts \ - -I$(builddir) \ - -I$(builddir)/api/ts \ + -I. \ + -I./api/ts \ -I$(top_srcdir)/lib noinst_HEADERS = \
