diff options
| author | Arnstein Ressem <aressem@yahoo-inc.com> | 2016-06-17 08:47:48 +0200 |
|---|---|---|
| committer | Arnstein Ressem <aressem@yahoo-inc.com> | 2016-06-17 08:47:48 +0200 |
| commit | fb3e3c9aa287544276dc69689206826f59bf1aed (patch) | |
| tree | 0e23f008736a0467c007684da32db2c6629e309f | |
| parent | 1934e961b908c85415650117a8b9024afaf6dfa6 (diff) | |
Moved scripts to where the other scripts expects to find them.
| -rw-r--r-- | dist/vespa.spec | 10 | ||||
| -rw-r--r-- | install_java.cmake | 1 |
2 files changed, 5 insertions, 6 deletions
diff --git a/dist/vespa.spec b/dist/vespa.spec index 1bcda21c45c..cc2b4882296 100644 --- a/dist/vespa.spec +++ b/dist/vespa.spec @@ -177,11 +177,11 @@ exit 0 %{_prefix}/libexec/vespa/common-env.sh %{_prefix}/libexec/vespa/start-vespa-base.sh %{_prefix}/libexec/vespa/stop-vespa-base.sh -%{_prefix}/libexec/start-file -%{_prefix}/libexec/ping-configserver -%{_prefix}/libexec/start-configserver -%{_prefix}/libexec/start-logd -%{_prefix}/libexec/stop-configserver +%{_prefix}/libexec/vespa/start-file +%{_prefix}/libexec/vespa/ping-configserver +%{_prefix}/libexec/vespa/start-configserver +%{_prefix}/libexec/vespa/start-logd +%{_prefix}/libexec/vespa/stop-configserver %{_prefix}/var/db/vespa/config_server/serverdb/classes/*.def %{_prefix}/lib/vespa/jars/*.jar %{_prefix}/lib/perl5/site_perl/Yahoo/Vespa/*.pm diff --git a/install_java.cmake b/install_java.cmake index bdc2acbaa2d..ec609dd2608 100644 --- a/install_java.cmake +++ b/install_java.cmake @@ -24,7 +24,6 @@ install_fat_java_artifact(persistence) install_fat_java_artifact(simplemetrics) install_fat_java_artifact(vespaclient-container-plugin) -vespa_install_script(standalone-container/src/main/sh/jdisc_container_start bin) vespa_install_script(jdisc_core/src/main/perl/jdisc_logfmt bin) install(FILES jdisc_core/src/main/perl/jdisc_logfmt.1 DESTINATION man/man1) |