Skip to content

Commit

Permalink
Install a wrapper script for the Python tools
Browse files Browse the repository at this point in the history
And install the Python files in $libdir/python

Change-Id: I19cdc3fe304f92cdf2840feae49ed855152a6037
Reviewed-on: http://review.membase.org/3428
Reviewed-by: Steve Yen <steve.yen@gmail.com>
Tested-by: Steve Yen <steve.yen@gmail.com>
  • Loading branch information
trondn authored and steveyen committed Nov 1, 2010
1 parent 5ddc672 commit 6a9c5e6
Show file tree
Hide file tree
Showing 4 changed files with 42 additions and 1 deletion.
6 changes: 6 additions & 0 deletions .gitignore
Expand Up @@ -27,6 +27,12 @@
/libtool
/ltmain.sh
/m4/version.m4
/management/collectd
/management/collectd_memcached_buckets
/management/create_bucket
/management/delete_bucket
/management/list_buckets
/management/python_wrapper
/missing
/mkinstalldirs
/stamp-h1
Expand Down
27 changes: 27 additions & 0 deletions Makefile.am
Expand Up @@ -21,6 +21,33 @@ testapp_DEPENDENCIES = mock_engine.la
testapp_CFLAGS = $(common_CFLAGS)
testapp_LDFLAGS = $(common_LDFLAGS)

pythonlibdir=$(libdir)/python
pythonlib_DATA= \
management/mc_bin_client.py \
management/memcacheConstants.py \
management/types.db

pythonlib_SCRIPTS= \
management/collectd.py \
management/collectd_memcached_buckets.py \
management/create_bucket.py \
management/delete_bucket.py \
management/list_buckets.py

PYTHON_TOOLS= \
management/collectd \
management/collectd_memcached_buckets \
management/create_bucket \
management/delete_bucket \
management/list_buckets

${PYTHON_TOOLS}: management/python_wrapper
cp $< $@

BUILT_SOURCES = ${PYTHON_TOOLS}
CLEANFILES = ${PYTHON_TOOLS}
bin_SCRIPTS = ${PYTHON_TOOLS}

pkgdata_SCRIPTS = management/create_bucket.py management/delete_bucket.py management/list_buckets.py management/mc_bin_client.py management/memcacheConstants.py management/collectd.py management/collectd_memcached_buckets.py management/types.db

EXTRA_DIST = $(pkgdata_SCRIPTS) win32 README.markdown
Expand Down
2 changes: 1 addition & 1 deletion configure.ac
Expand Up @@ -80,5 +80,5 @@ AC_SUBST(MEMCACHED_DIR)

dnl ----------------------------------------------------------------------------

AC_CONFIG_FILES(Makefile)
AC_CONFIG_FILES(Makefile management/python_wrapper)
AC_OUTPUT
8 changes: 8 additions & 0 deletions management/python_wrapper.in
@@ -0,0 +1,8 @@
#! /bin/sh
if test -z "${PYTHONPATH}"; then
PYTHONPATH=@libdir@/python
else
PYTHONPATH=@libdir@/python:${PYTHONPATH}
fi
export PYTHONPATH
exec @libdir@/python/`basename $0`.py "$@"

0 comments on commit 6a9c5e6

Please sign in to comment.