You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@madlib.apache.org by ri...@apache.org on 2016/02/11 01:10:14 UTC
incubator-madlib git commit: Build: Fix reference to license dir
after a6acafd
Repository: incubator-madlib
Updated Branches:
refs/heads/master 5952569bf -> b9054a48b
Build: Fix reference to license dir after a6acafd
Project: http://git-wip-us.apache.org/repos/asf/incubator-madlib/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-madlib/commit/b9054a48
Tree: http://git-wip-us.apache.org/repos/asf/incubator-madlib/tree/b9054a48
Diff: http://git-wip-us.apache.org/repos/asf/incubator-madlib/diff/b9054a48
Branch: refs/heads/master
Commit: b9054a48b6b977b878a3d91651d550a5bb5a9042
Parents: 5952569
Author: Rahul Iyer <ri...@pivotal.io>
Authored: Wed Feb 10 15:04:01 2016 -0800
Committer: Rahul Iyer <ri...@pivotal.io>
Committed: Wed Feb 10 15:04:25 2016 -0800
----------------------------------------------------------------------
CMakeLists.txt | 2 +-
README.md | 2 +-
ReadMe.txt | 2 +-
deploy/PackageMaker/CMakeLists.txt | 2 +-
doc/CMakeLists.txt | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-madlib/blob/b9054a48/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c00b79f..949aaf7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -174,7 +174,7 @@ endif(NOT M4_BINARY)
# -- Install Read-me files and license directory -------------------------------
-install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/license"
+install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/licenses"
DESTINATION .
COMPONENT core
PATTERN ".DS_Store" EXCLUDE
http://git-wip-us.apache.org/repos/asf/incubator-madlib/blob/b9054a48/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index 006c0aa..b13ff7a 100644
--- a/README.md
+++ b/README.md
@@ -40,7 +40,7 @@ MADlib incorporates material from the following third-party components
Licensing
==========
License information regarding MADlib and included third-party libraries can be
-found inside the [`license`](https://github.com/madlib/madlib/blob/master/license) directory.
+found inside the [`license`](https://github.com/madlib/madlib/blob/master/licenses) directory.
Release Notes
=============
http://git-wip-us.apache.org/repos/asf/incubator-madlib/blob/b9054a48/ReadMe.txt
----------------------------------------------------------------------
diff --git a/ReadMe.txt b/ReadMe.txt
index 7f6be1e..3b1a0e0 100644
--- a/ReadMe.txt
+++ b/ReadMe.txt
@@ -32,7 +32,7 @@ MADlib incorporates material from the following third-party components:
http://pyyaml.org/wiki/PyYAML
License information regarding MADlib and included third-party libraries can be
-found inside the license directory.
+found inside the 'licenses' directory.
-------------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-madlib/blob/b9054a48/deploy/PackageMaker/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/deploy/PackageMaker/CMakeLists.txt b/deploy/PackageMaker/CMakeLists.txt
index c25fdc4..81a6dcc 100644
--- a/deploy/PackageMaker/CMakeLists.txt
+++ b/deploy/PackageMaker/CMakeLists.txt
@@ -11,7 +11,7 @@
set(CPACK_RESOURCE_FILE_README
"${CPACK_PACKAGE_DESCRIPTION_FILE}" PARENT_SCOPE)
set(CPACK_RESOURCE_FILE_LICENSE
- "${CMAKE_SOURCE_DIR}/license/MADlib.txt" PARENT_SCOPE)
+ "${CMAKE_SOURCE_DIR}/licenses/MADlib.txt" PARENT_SCOPE)
set(CPACK_RESOURCE_FILE_WELCOME
"${CMAKE_CURRENT_SOURCE_DIR}/Welcome.html" PARENT_SCOPE)
set(CPACK_OSX_PACKAGE_VERSION "10.5" PARENT_SCOPE)
http://git-wip-us.apache.org/repos/asf/incubator-madlib/blob/b9054a48/doc/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
index 52c6057..3a5960c 100644
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@@ -4,7 +4,7 @@
set(DOXYGEN_README_FILE "../ReadMe.txt" CACHE STRING
"Path to ReadMe file relative to the doc directory after installation")
-set(DOXYGEN_LICENSE_DIR "../../license" CACHE STRING
+set(DOXYGEN_LICENSE_DIR "../../licenses" CACHE STRING
"Path to license directory relative to the doc directory after installation")
configure_file(
mainpage.dox.in