From 1c581325b15e92ddcc3a3ad5f8b9e22e01031711 Mon Sep 17 00:00:00 2001
From: Ger van Diepen <diepen@astron.nl>
Date: Tue, 9 Dec 2008 11:18:11 +0000
Subject: [PATCH] bug 1246: Use new lofar_PYTHON

---
 CEP/BB/pyparmdb/configure.in    | 3 +--
 CEP/BB/pyparmdb/src/Makefile.am | 6 +++---
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/CEP/BB/pyparmdb/configure.in b/CEP/BB/pyparmdb/configure.in
index 8d3b3991450..0030ddaa261 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 9eae35decb7..c089a076dee 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
 
-- 
GitLab