arrow-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From u..@apache.org
Subject arrow git commit: ARROW-689: [GLib] Fix install directories
Date Wed, 22 Mar 2017 17:34:59 GMT
Repository: arrow
Updated Branches:
  refs/heads/master 1b957dcf1 -> 36103143b


ARROW-689: [GLib] Fix install directories

Header files should be installed into
`${PREFIX}/include/arrow-glib/` instead of
`${PREFIX}/include/apache-arrow-glib/`.

Documents should be installed into
`${PREFIX}/share/doc/arrow-glib/` instead of
`${PREFIX}/share/doc/apache-arrow-glib/`.

We needed to change install directories when we changed `AC_INIT()`'s 3rd
argument to apache-arrow-glib...

Author: Kouhei Sutou <kou@clear-code.com>

Closes #421 from kou/glib-fix-install-directory and squashes the following commits:

65e5cee [Kouhei Sutou] [GLib] Fix install directories


Project: http://git-wip-us.apache.org/repos/asf/arrow/repo
Commit: http://git-wip-us.apache.org/repos/asf/arrow/commit/36103143
Tree: http://git-wip-us.apache.org/repos/asf/arrow/tree/36103143
Diff: http://git-wip-us.apache.org/repos/asf/arrow/diff/36103143

Branch: refs/heads/master
Commit: 36103143b5975138522f4e54f8b21565a34f6504
Parents: 1b957dc
Author: Kouhei Sutou <kou@clear-code.com>
Authored: Wed Mar 22 18:34:52 2017 +0100
Committer: Uwe L. Korn <uwelk@xhochy.com>
Committed: Wed Mar 22 18:34:52 2017 +0100

----------------------------------------------------------------------
 c_glib/Makefile.am            | 3 ++-
 c_glib/arrow-glib/Makefile.am | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/arrow/blob/36103143/c_glib/Makefile.am
----------------------------------------------------------------------
diff --git a/c_glib/Makefile.am b/c_glib/Makefile.am
index c078b08..40e8395 100644
--- a/c_glib/Makefile.am
+++ b/c_glib/Makefile.am
@@ -27,6 +27,7 @@ EXTRA_DIST =					\
 	LICENSE.txt				\
 	version
 
-doc_DATA =					\
+arrow_glib_docdir = ${datarootdir}/doc/arrow-glib
+arrow_glib_doc_DATA =				\
 	README.md				\
 	LICENSE.txt

http://git-wip-us.apache.org/repos/asf/arrow/blob/36103143/c_glib/arrow-glib/Makefile.am
----------------------------------------------------------------------
diff --git a/c_glib/arrow-glib/Makefile.am b/c_glib/arrow-glib/Makefile.am
index a948007..a72d1e8 100644
--- a/c_glib/arrow-glib/Makefile.am
+++ b/c_glib/arrow-glib/Makefile.am
@@ -403,7 +403,8 @@ stamp-ipc-enums.c: $(libarrow_ipc_glib_la_headers) ipc-enums.c.template
 	     $(libarrow_ipc_glib_la_headers)) > ipc-enums.c
 	touch $@
 
-pkginclude_HEADERS =					\
+arrow_glib_includedir = $(includedir)/arrow-glib
+arrow_glib_include_HEADERS =				\
 	$(libarrow_glib_la_headers)			\
 	$(libarrow_glib_la_cpp_headers)			\
 	$(libarrow_glib_la_generated_headers)		\


Mime
View raw message