diff options
| author | Tor Egge <Tor.Egge@broadpark.no> | 2020-01-15 16:28:04 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-15 16:28:04 +0100 |
| commit | db4daed404f1d9f3a13a931248f328b404e98caf (patch) | |
| tree | 6e4b1682cbcd99a5e03eb14e91f048f112f56c06 | |
| parent | a01e3d298745b29f3f989f3ee5eedc0d7f6fec6c (diff) | |
| parent | f8d61167863b0d47e17cf469bd80ae496935bbe1 (diff) | |
Merge pull request #11794 from vespa-engine/toregge/use-wrapper-script-for-vespa-configproxy-cmd
Use shell script wrapper for vespa-configproxy-cmd.
| -rw-r--r-- | config/src/apps/vespa-configproxy-cmd/.gitignore | 2 | ||||
| -rw-r--r-- | config/src/apps/vespa-configproxy-cmd/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | vespabase/CMakeLists.txt | 1 |
3 files changed, 3 insertions, 2 deletions
diff --git a/config/src/apps/vespa-configproxy-cmd/.gitignore b/config/src/apps/vespa-configproxy-cmd/.gitignore index dc57b8535bb..f70965ee197 100644 --- a/config/src/apps/vespa-configproxy-cmd/.gitignore +++ b/config/src/apps/vespa-configproxy-cmd/.gitignore @@ -1,3 +1,3 @@ /.depend /Makefile -/vespa-configproxy-cmd +/vespa-configproxy-cmd-bin diff --git a/config/src/apps/vespa-configproxy-cmd/CMakeLists.txt b/config/src/apps/vespa-configproxy-cmd/CMakeLists.txt index 0976c42072a..d1090f81d14 100644 --- a/config/src/apps/vespa-configproxy-cmd/CMakeLists.txt +++ b/config/src/apps/vespa-configproxy-cmd/CMakeLists.txt @@ -4,7 +4,7 @@ vespa_add_executable(config_configproxy-cmd_app main.cpp methods.cpp proxycmd.cpp - OUTPUT_NAME vespa-configproxy-cmd + OUTPUT_NAME vespa-configproxy-cmd-bin INSTALL bin DEPENDS ) diff --git a/vespabase/CMakeLists.txt b/vespabase/CMakeLists.txt index ec83e3f567e..c3e5690d505 100644 --- a/vespabase/CMakeLists.txt +++ b/vespabase/CMakeLists.txt @@ -2,6 +2,7 @@ vespa_install_script(src/start-cbinaries.sh vespa-get-config bin) vespa_install_script(src/start-cbinaries.sh vespa-verify-ranksetup bin) vespa_install_script(src/start-cbinaries.sh vespa-config-status bin) +vespa_install_script(src/start-cbinaries.sh vespa-configproxy-cmd bin) vespa_install_script(src/start-cbinaries.sh vespa-doclocator bin) vespa_install_script(src/start-cbinaries.sh vespa-model-inspect bin) vespa_install_script(src/start-cbinaries.sh vespa-proton-cmd bin) |