diff options
| author | Daniil Baturin <daniil@baturin.org> | 2018-05-16 16:01:38 +0200 |
|---|---|---|
| committer | Daniil Baturin <daniil@baturin.org> | 2018-05-16 16:02:33 +0200 |
| commit | d4c10902026b76a6372cf738fc98860b29b39759 (patch) | |
| tree | c8d3958d564f876b74e80f68727bbe5f02a57aed /debian | |
| parent | be6f809581ccbcd6411713128a63711eaa2ce6b7 (diff) | |
| download | vyos-1x-d4c10902026b76a6372cf738fc98860b29b39759.tar.gz vyos-1x-d4c10902026b76a6372cf738fc98860b29b39759.zip | |
T644: remove prefixing from all scripts and update environment variables with VyOS paths.
Diffstat (limited to 'debian')
| -rwxr-xr-x | debian/rules | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/debian/rules b/debian/rules index 3781a6f71..31deefeff 100755 --- a/debian/rules +++ b/debian/rules @@ -1,9 +1,9 @@ #!/usr/bin/make -f DIR := debian/vyos-1x -VYOS_SBIN_DIR := opt/vyatta/sbin/ -VYOS_BIN_DIR := opt/vyatta/bin/ -VYOS_LIBEXEC_DIR := opt/vyatta/libexec +VYOS_SBIN_DIR := usr/sbin/ +VYOS_BIN_DIR := usr/bin/ +VYOS_LIBEXEC_DIR := usr/libexec/vyos VYOS_CFG_TMPL_DIR := /opt/vyatta/share/vyatta-cfg/templates VYOS_OP_TMPL_DIR := /opt/vyatta/share/vyatta-op/templates @@ -20,13 +20,23 @@ override_dh_auto_install: # Install scripts mkdir -p $(DIR)/$(VYOS_SBIN_DIR) mkdir -p $(DIR)/$(VYOS_BIN_DIR) - cp -r src/conf_mode/* $(DIR)/$(VYOS_SBIN_DIR) - cp -r src/op_mode/* $(DIR)/$(VYOS_BIN_DIR) + + # Install conf mode scripts + mkdir -p $(DIR)/$(VYOS_LIBEXEC_DIR)/conf_mode + cp -r src/conf_mode/* $(DIR)/$(VYOS_LIBEXEC_DIR)/conf_mode + + # Install op mode scripts + mkdir -p $(DIR)/$(VYOS_LIBEXEC_DIR)/op_mode + cp -r src/op_mode/* $(DIR)/$(VYOS_LIBEXEC_DIR)/op_mode # Install validators mkdir -p $(DIR)/$(VYOS_LIBEXEC_DIR)/validators cp -r src/validators/* $(DIR)/$(VYOS_LIBEXEC_DIR)/validators + # Install completion helpers + mkdir -p $(DIR)/$(VYOS_LIBEXEC_DIR)/completion + cp -r src/completion/* $(DIR)/$(VYOS_LIBEXEC_DIR)/completion + # Install helper scripts cp -r src/helpers/* $(DIR)/$(VYOS_LIBEXEC_DIR)/ |