afonso/core-extra
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

updated installation to use pip for core_python, added a pip check to configure.ac

Browse source
This commit is contained in:
Blake J. Harnden 2017-08-08 11:29:01 -07:00
parent 67d451c3e9
commit eb5dd3780c
2 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
configure.ac
View file

@ -147,6 +147,11 @@ if test "x$enable_daemon" = "xyes" ; then
AC_CHECK_PROG(ovs_of_path, ovs-ofctl, $as_dir, no, $SEARCHPATH) AC_CHECK_PROG(ovs_of_path, ovs-ofctl, $as_dir, no, $SEARCHPATH)
fi 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(dia, dia, yes, no)
AC_CHECK_PROG(help2man, help2man, yes, no, $SEARCHPATH) AC_CHECK_PROG(help2man, help2man, yes, no, $SEARCHPATH)
if test "x$convert" = "xno" ; then if test "x$convert" = "xno" ; then

4
daemon/Makefile.am
View file

@ -85,7 +85,7 @@ build:
# Python package install # Python package install
install-exec-hook: 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: install-data-local:
$(MKDIR_P) $(DESTDIR)$(LOGROTATE_DIR) $(MKDIR_P) $(DESTDIR)$(LOGROTATE_DIR)
@ -97,7 +97,7 @@ uninstall-local:
# Python package uninstall # Python package uninstall
uninstall-hook: 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 -f ${pythondir}/core_python_netns-1.0-py${PYTHON_VERSION}.egg-info
rm -rf ${pythondir}/core rm -rf ${pythondir}/core
rmdir -p $(coreexservicesdir) || true rmdir -p $(coreexservicesdir) || true