diff options
| author | Arnstein Ressem <aressem@yahoo-inc.com> | 2017-02-02 21:41:29 +0100 |
|---|---|---|
| committer | Arnstein Ressem <aressem@yahoo-inc.com> | 2017-02-02 21:41:29 +0100 |
| commit | 4cb1dc253629bccb7c73c31c394f25707846584a (patch) | |
| tree | 2661b8f71bcaea205aaa39af23368e2360bcce2b | |
| parent | 13ab37175b794e57abbe9fc110811e7b7e311ebc (diff) | |
Fix make install from out of source build.
| -rw-r--r-- | install_java.cmake | 2 | ||||
| -rw-r--r-- | vespabase/CMakeLists.txt | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/install_java.cmake b/install_java.cmake index 97fdae3267b..2744e095795 100644 --- a/install_java.cmake +++ b/install_java.cmake @@ -72,6 +72,7 @@ install(FILES install(FILES chain/src/main/resources/configdefinitions/chains.def + config-provisioning/src/main/resources/configdefinitions/flavors.def configdefinitions/src/vespa/application-id.def configdefinitions/src/vespa/attributes.def configdefinitions/src/vespa/cluster-info.def @@ -176,7 +177,6 @@ install(FILES logd/src/main/resources/configdefinitions/logd.def messagebus/src/main/config/messagebus.def metrics/src/vespa/metrics/metricsmanager.def - node-repository/src/main/resources/configdefinitions/node-repository.def orchestrator/src/main/resources/configdefinitions/orchestrator.def persistence/src/main/resources/configdefinitions/persistence-rpc.def searchcore/src/vespa/searchcore/config/fdispatchrc.def diff --git a/vespabase/CMakeLists.txt b/vespabase/CMakeLists.txt index 89b8dc1f268..b4ed5c69044 100644 --- a/vespabase/CMakeLists.txt +++ b/vespabase/CMakeLists.txt @@ -37,6 +37,6 @@ vespa_install_script(src/vespa-stop-services.sh vespa-stop-services bin) configure_file(src/vespa.service.in src/vespa.service @ONLY) configure_file(src/vespa-configserver.service.in src/vespa-configserver.service @ONLY) -install(FILES src/vespa.service src/vespa-configserver.service DESTINATION etc/systemd/system) +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/src/vespa.service ${CMAKE_CURRENT_BINARY_DIR}/src/vespa-configserver.service DESTINATION etc/systemd/system) install(FILES src/Defaults.pm DESTINATION lib/perl5/site_perl/Yahoo/Vespa) |