You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by bc...@apache.org on 2014/05/23 20:26:04 UTC
git commit: TS-2308: includedir in config.layout is not used
Repository: trafficserver
Updated Branches:
refs/heads/master 2bf9a464f -> e5caea81d
TS-2308: includedir in config.layout is not used
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/e5caea81
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/e5caea81
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/e5caea81
Branch: refs/heads/master
Commit: e5caea81dc097d5aa1b792b598ce357963952199
Parents: 2bf9a46
Author: Bryan Call <bc...@apache.org>
Authored: Fri May 23 11:25:38 2014 -0700
Committer: Bryan Call <bc...@apache.org>
Committed: Fri May 23 11:25:38 2014 -0700
----------------------------------------------------------------------
CHANGES | 2 ++
lib/ts/Makefile.am | 5 +++--
mgmt/api/include/Makefile.am | 4 ++--
proxy/api/ts/Makefile.am | 4 ++--
4 files changed, 9 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/e5caea81/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index 8f9d0d2..11da5e1 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,8 @@
-*- coding: utf-8 -*-
Changes with Apache Traffic Server 5.0.0
+ *) [TS-2308] includedir in config.layout is not used
+
*) [TS-2527] mgmtapi.h should be C style. This is slightly ugly in the core
now, but that public struct/union has to be named to be C99 compliant.
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/e5caea81/lib/ts/Makefile.am
----------------------------------------------------------------------
diff --git a/lib/ts/Makefile.am b/lib/ts/Makefile.am
index 97c37d7..31a0fff 100644
--- a/lib/ts/Makefile.am
+++ b/lib/ts/Makefile.am
@@ -15,9 +15,10 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
-includedir=$(prefix)/include/ts
-include_HEADERS = apidefs.h
+library_includedir=$(includedir)/ts
+
+library_include_HEADERS = apidefs.h
noinst_PROGRAMS = mkdfa CompileParseRules
check_PROGRAMS = test_atomic test_freelist test_arena test_List test_Map test_Vec
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/e5caea81/mgmt/api/include/Makefile.am
----------------------------------------------------------------------
diff --git a/mgmt/api/include/Makefile.am b/mgmt/api/include/Makefile.am
index e019e89..31762e4 100644
--- a/mgmt/api/include/Makefile.am
+++ b/mgmt/api/include/Makefile.am
@@ -16,7 +16,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-includedir=$(prefix)/include/ts
+library_includedir=$(includedir)/ts
-include_HEADERS = \
+library_include_HEADERS = \
mgmtapi.h
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/e5caea81/proxy/api/ts/Makefile.am
----------------------------------------------------------------------
diff --git a/proxy/api/ts/Makefile.am b/proxy/api/ts/Makefile.am
index 16c76d3..5577006 100644
--- a/proxy/api/ts/Makefile.am
+++ b/proxy/api/ts/Makefile.am
@@ -16,9 +16,9 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-includedir=$(prefix)/include/ts
+library_includedir=$(includedir)/ts
-include_HEADERS = \
+library_include_HEADERS = \
ts.h \
remap.h \
experimental.h