diff --git a/CEP/BB/pyparmdb/configure.in b/CEP/BB/pyparmdb/configure.in index 8d3b3991450d5574e2f7d331c43eaa0592718b22..0030ddaa261ec1cbb2dccda53766da284c8bc174 100644 --- a/CEP/BB/pyparmdb/configure.in +++ b/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 diff --git a/CEP/BB/pyparmdb/src/Makefile.am b/CEP/BB/pyparmdb/src/Makefile.am index 9eae35decb7a9c072e20aeb1c4207666a598f41f..c089a076deeb05d4590d6ae05c6f9cc8b5784046 100644 --- a/CEP/BB/pyparmdb/src/Makefile.am +++ b/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