Always build in python/ subdir.

* configure.in (PYTHON_SUBDIR): Don't set.  Remove all uses.
* Makefile.am (SUBDIRS): Hard-code "python" here.
(tests): Test equivalent "$(pythondir)", not @PYTHON_SUBDIR@.
This commit is contained in:
Jim Meyering 2007-12-12 08:12:38 +00:00
parent 9e188e11c5
commit 0d0b0113d0
3 changed files with 9 additions and 9 deletions

View File

@ -1,3 +1,10 @@
Wed Dec 12 09:11:44 CET 2007 Jim Meyering <meyering@redhat.com>
Always build in python/ subdir.
* configure.in (PYTHON_SUBDIR): Don't set. Remove all uses.
* Makefile.am (SUBDIRS): Hard-code "python" here.
(tests): Test equivalent "$(pythondir)", not @PYTHON_SUBDIR@.
Wed Dec 12 08:20:07 CET 2007 Jim Meyering <meyering@redhat.com>
Accommodate automake-1.9.

View File

@ -1,7 +1,7 @@
## Process this file with automake to produce Makefile.in
SUBDIRS = gnulib/lib include src qemud proxy docs gnulib/tests \
@PYTHON_SUBDIR@ tests po scripts
python tests po scripts
ACLOCAL_AMFLAGS = -I m4 -I gnulib/m4
@ -21,7 +21,7 @@ check-local: all tests
tests:
@(cd docs/examples ; $(MAKE) MAKEFLAGS+=--silent tests)
@(if [ "@PYTHON_SUBDIR@" != "" ] ; then cd python ; \
@(if [ "$(pythondir)" != "" ] ; then cd python ; \
$(MAKE) MAKEFLAGS+=--silent tests ; fi)
cov: cov-recursive cov-am

View File

@ -568,14 +568,7 @@ else
PYTHON=
fi
AM_CONDITIONAL(WITH_PYTHON, test "$PYTHON_INCLUDES" != "")
if test "$PYTHON_INCLUDES" != ""
then
PYTHON_SUBDIR=python
else
PYTHON_SUBDIR=
fi
AC_SUBST(pythondir)
AC_SUBST(PYTHON_SUBDIR)
AC_SUBST(PYTHON_VERSION)
AC_SUBST(PYTHON_INCLUDES)
AC_SUBST(PYTHON_SITE_PACKAGES)