diff --git a/configure.ac b/configure.ac index 80730abd..c5c4a773 100644 --- a/configure.ac +++ b/configure.ac @@ -147,6 +147,11 @@ if test "x$enable_daemon" = "xyes" ; then AC_CHECK_PROG(ovs_of_path, ovs-ofctl, $as_dir, no, $SEARCHPATH) fi +AC_CHECK_PROG(pip_installed, pip, yes, no, $SEARCHPATH) +if test "x$pip_installed" = "xno" ; then + AC_MSG_ERROR([Could not locate pip. Please install python-pip.]) +fi + #AC_CHECK_PROG(dia, dia, yes, no) AC_CHECK_PROG(help2man, help2man, yes, no, $SEARCHPATH) if test "x$convert" = "xno" ; then diff --git a/daemon/Makefile.am b/daemon/Makefile.am index 74673b8a..fde0871c 100644 --- a/daemon/Makefile.am +++ b/daemon/Makefile.am @@ -85,7 +85,7 @@ build: # Python package install install-exec-hook: - $(PYTHON) $(SETUPPY) $(SETUPPYFLAGS) install --prefix=${DESTDIR}/${pyprefix} --install-purelib=${DESTDIR}/${pythondir} --install-platlib=${DESTDIR}/${pyexecdir} --no-compile + pip install . install-data-local: $(MKDIR_P) $(DESTDIR)$(LOGROTATE_DIR) @@ -97,7 +97,7 @@ uninstall-local: # Python package uninstall uninstall-hook: - rm -f ${pythondir}/core_python-${COREDPY_VERSION}-py${PYTHON_VERSION}.egg-info + yes | pip uninstall core_python rm -f ${pythondir}/core_python_netns-1.0-py${PYTHON_VERSION}.egg-info rm -rf ${pythondir}/core rmdir -p $(coreexservicesdir) || true