Fix configures and python test

Hubert Siejkowski
1 parent 43d69712
Showing 3 changed files with 7 additions and 7 deletions
configure.ac
pyext/Makefile.am
test/Makefile.am
@@ -630,7 +630,7 @@ else
   # Do we have wrappers (ctools_wrap.cpp and ctools.py)?
   has_wrappers="yes"
-  AC_CHECK_FILES([pyext/ctools_wrap.cpp pyext/ctools.py],,
+  AC_CHECK_FILES([pyext/ctools/ctools_wrap.cpp pyext/ctools/ctools.py],,
                  [has_wrappers="no"])
   if test "x$has_wrappers" = "xno"; then
     AC_MSG_WARN([Python wrapper missing. Requires swig for wrapper generation.])
@@ -669,7 +669,7 @@ if test &quot;x$enable_python&quot; = &quot;xyes&quot;; then
 else
   if test "x$has_python_wrap" = "xno" -a "x$has_swig" = "xno"; then
-    AC_MSG_WARN([Neither pyext/ctools_wrap.cpp and pyext/ctools.py nor swig has not been found])
+    AC_MSG_WARN([Neither pyext/ctools/ctools_wrap.cpp and pyext/ctools/ctools.py nor swig has not been found])
     AC_MSG_WARN([Python binding for ctools cannot be built])
     AC_MSG_WARN([Either use a ctools distribution with ctools_wrap.cpp and ctools.py shipped or install swig on your system])
     AC_MSG_WARN([swig can be obtained from http://www.swig.org/])
@@ -39,7 +39,7 @@ include $(DEPFILES)
 # Define the targets that should be built before anything else.
 # These are honored by 'make all', 'make check' and 'make install'.
 if HAVE_SWIG
-  BUILT_SOURCES = ctools_wrap.cpp ctools/ctools.py
+  BUILT_SOURCES = ctools/ctools_wrap.cpp ctools/ctools.py
 endif
 # Set files to be removed in clean. We remove only the SWIG interface files
@@ -59,7 +59,7 @@ all-local: build
 # of this specific directory. So we build one instance for checking, the other
 # for installation. If we could get the name built by distutils we could avoid
 # this.
-build: ctools_wrap.cpp ctools/ctools.py
+build: ctools/ctools_wrap.cpp ctools/ctools.py
 	$(PYTHON) setup.py build
 install-exec-local:
@@ -70,8 +70,8 @@ clean-local:
 # Rule for building Python wrappers using SWIG.
 if HAVE_SWIG
-ctools/ctools.py: ctools_wrap.cpp
-ctools_wrap.cpp: $(SWIG_INTERFACE)
+ctools/ctools.py: ctools/ctools_wrap.cpp
+ctools/ctools_wrap.cpp: $(SWIG_INTERFACE)
 	if $(SWIGCOMPILE) -MMD -MF "ctools.Tpi" -o ctools/ctools_wrap.cpp $<; \
 	then mv -f "ctools.Tpi" "ctools.Pi"; else rm -f "ctools.Tpi"; exit 1; fi
 endif # HAVE_SWIG
@@ -8,7 +8,7 @@ MACOSX_DEPLOYMENT_TARGET=@CONFIGURE_MACOSX_DEPLOYMENT_TARGET@
 if WITH_PYTHON
   TEST_CSCRIPTS      = test_cscripts.sh
   TEST_PYTHON_SCRIPT = test_python.py
-  TEST_PYTHON_ENV    = PYTHONPATH=$(top_builddir)/pyext:$(top_builddir)/pyext/build/ctools:$(top_builddir)/scripts:$(pythondir):$(pyexecdir):$(PYTHONPATH)
+  TEST_PYTHON_ENV    = PYTHONPATH=$(top_builddir)/pyext:$(top_builddir)/pyext/build/ctools/ctools:$(top_builddir)/scripts:$(pythondir):$(pyexecdir):$(PYTHONPATH)
 endif
 # Set test environment