diff options
| author | Francis Dupont <fdupont@isc.org> | 2017-03-12 02:41:53 +0100 |
|---|---|---|
| committer | Francis Dupont <fdupont@isc.org> | 2017-03-12 02:41:53 +0100 |
| commit | 8d4a4511c8100e00bfb4264a43526b860697fa3b (patch) | |
| tree | c4b05ab151760739771d1efc31d547ebddeddda6 /src/bin/shell | |
| parent | [5170] Moved hook library to if HAVE_GTEST (diff) | |
| download | kea-8d4a4511c8100e00bfb4264a43526b860697fa3b.tar.xz kea-8d4a4511c8100e00bfb4264a43526b860697fa3b.zip | |
[5170] Done
Diffstat (limited to 'src/bin/shell')
| -rw-r--r-- | src/bin/shell/Makefile.am | 11 | ||||
| -rw-r--r-- | src/bin/shell/kea-shell.in | 3 |
2 files changed, 5 insertions, 9 deletions
diff --git a/src/bin/shell/Makefile.am b/src/bin/shell/Makefile.am index 94e1402f56..69a1fe4924 100644 --- a/src/bin/shell/Makefile.am +++ b/src/bin/shell/Makefile.am @@ -5,10 +5,9 @@ EXTRA_DIST = if KEA_SHELL # Kea-shell is enabled, here are proper rules for it. -kea_shell_PYTHON = kea_conn.py kea_connector2.py kea_connector3.py -kea_shelldir = @localstatedir@/@PACKAGE@ +pkgpython_PYTHON = kea_conn.py kea_connector2.py kea_connector3.py -bin_SCRIPTS = kea-shell +sbin_SCRIPTS = kea-shell else @@ -37,12 +36,6 @@ $(man_MANS): endif -install-data-local: - $(mkinstalldirs) $(DESTDIR)/@localstatedir@/@PACKAGE@ - -install-data-hook: - -chmod 2770 $(DESTDIR)/@localstatedir@/@PACKAGE@ - CLEANDIRS = __pycache__ clean-local: diff --git a/src/bin/shell/kea-shell.in b/src/bin/shell/kea-shell.in index e86c53c733..619f936cd0 100644 --- a/src/bin/shell/kea-shell.in +++ b/src/bin/shell/kea-shell.in @@ -17,10 +17,13 @@ Text client for Control Agent process # that's a stand alone package that requires separate installation. One of # the design requirements was to not require any additional packages, so # the code uses standard libraries available in python. Hence two versions. +import os import sys import signal import argparse +sys.path.append('@PKGPYTHONDIR@') + from kea_conn import CARequest # CAResponse if sys.version_info[0] == 2: |