bug 1246:

Use new lofar_PYTHON

CEP/BB/pyparmdb/configure.in

@@ -48,7 +48,7 @@ dnl Checks for library functions.
 AC_FUNC_VPRINTF
 
 dnl Checks for Python
-AM_PATH_PYTHON
+lofar_PYTHON
 
 dnl
 dnl Check for LOFAR specific things
@@ -62,7 +62,6 @@ lofar_INTERNAL(LCS/pytools,pytools,,,,"")
 lofar_EXTERNAL(pyrap,1,pyrap/Converters/PycBasicData.h)
 lofar_AIPSPP(1,"-ltables -lscimath -lscimath_f -lcasa")
 lofar_EXTERNAL(boost,1,boost/python.hpp,boost_python)
-lofar_PYTHON(1)
 
 dnl
 dnl Output Makefiles

CEP/BB/pyparmdb/src/Makefile.am

@@ -5,9 +5,9 @@ _parmdb_la_SOURCES	= pyparmdb.cc
 _parmdb_la_LDFLAGS	= -module
 _parmdb_la_DEPENDENCIES	= $(LOFAR_DEPEND)
 
-python_SCRIPTS = __init__.py
-pythondir = $(pythoninstalldir)/parmdb
-libdir    = $(pythondir)
+lofarpython_PYTHON	= __init__.py
+lofarpythondir		= $(pythondir)/lofar/parmdb
+libdir			= $(lofarpythondir)
 
 bin_PROGRAMS = versionpyparmdb