Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix make install from out of source build. #1673

Merged
merged 1 commit into from Feb 3, 2017
Merged

Fix make install from out of source build. #1673

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion install_java.cmake
View file
Open in desktop
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion vespabase/CMakeLists.txt
View file
Open in desktop
Expand Up @@ -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)