$OpenBSD$

Index: CMakeLists.txt
--- CMakeLists.txt.orig
+++ CMakeLists.txt
@@ -27,25 +27,17 @@ if (NOT BUILD_TYPE)
     set(CMAKE_BUILD_TYPE Debug)
 endif(NOT BUILD_TYPE)
 
-# this figures out the Python include directories and adds them to the
-# header file search path
-execute_process(
-    COMMAND python-config --includes
-    COMMAND sed -r "s/-I//g; s/ +/;/g"
-    COMMAND tr -d '\n'
-    OUTPUT_VARIABLE Python_Includes
-)
-message(STATUS "Python include dir:" ${Python_Includes})
+message(STATUS "Python include dir:" ${PYTHON_INCLUDE_DIR})
 
-include_directories(${Python_Includes})
+include_directories(${PYTHON_INCLUDE_DIR})
 include_directories(${CMAKE_CURRENT_SOURCE_DIR})
 
-find_package( Boost COMPONENTS python REQUIRED)  # find BOOST and boost-python
+find_package( Boost COMPONENTS python3 REQUIRED)  # find BOOST and boost-python
 if(Boost_FOUND)
     include_directories(${Boost_INCLUDE_DIRS})
     MESSAGE(STATUS "found Boost: " ${Boost_LIB_VERSION})
     MESSAGE(STATUS "boost-incude dirs are: " ${Boost_INCLUDE_DIRS})
-    MESSAGE(STATUS "boost-python lib is: " ${Boost_PYTHON_LIBRARY})
+    MESSAGE(STATUS "boost-python3 lib is: " ${Boost_PYTHON3_LIBRARY})
     MESSAGE(STATUS "boost_LIBRARY_DIRS is: " ${Boost_LIBRARY_DIRS})
     MESSAGE(STATUS "Boost_LIBRARIES is: " ${Boost_LIBRARIES})    
 endif()
@@ -116,21 +108,19 @@ include_directories( 
 # this makes the shared library
 if (USE_CLIPPER_FOR_CPP)
   add_library(
-      libarea
+      area
       SHARED
       ${AREA_SRC_COMMON}
       ${AREA_SRC_CLIPPER}
   )
 else (USE_CLIPPER_FOR_CPP)
   add_library(
-      libarea
+      area
       SHARED
       ${AREA_SRC_COMMON}
       ${AREA_SRC_KBOOL}
   )
 endif (USE_CLIPPER_FOR_CPP)
-set_target_properties(libarea PROPERTIES PREFIX "")
-set_target_properties(libarea PROPERTIES SOVERSION 0)
 
 # this part allow to support multi-arch
 # ie. Debian builder sets correctly the target path according to architecture
@@ -142,14 +132,14 @@ set_target_properties(libarea PROPERTIES SOVERSION 0)
 #    set(CMAKE_INSTALL_LIBDIR ${CMAKE_INSTALL_PREFIX}/lib)
 #endif(DEFINED CMAKE_INSTALL_LIBDIR)
 
-install(TARGETS libarea LIBRARY DESTINATION lib/ COMPONENT libraries)
+install(TARGETS area LIBRARY DESTINATION lib/ COMPONENT libraries)
 message(STATUS "Library will be installed to: " ${CMAKE_INSTALL_PREFIX}/lib)
 
 
 # this makes the Python module
 if (USE_CLIPPER_FOR_PYTHON)
   add_library(
-      area
+      pyarea
       MODULE
       ${AREA_SRC_COMMON}
       ${AREA_SRC_CLIPPER}
@@ -157,32 +147,21 @@ if (USE_CLIPPER_FOR_PYTHON)
   )
 else (USE_CLIPPER_FOR_PYTHON)
   add_library(
-      area
+      pyarea
       MODULE
       ${AREA_SRC_COMMON}
       ${AREA_SRC_KBOOL}
       ${PYAREA_SRC}
   )
 endif (USE_CLIPPER_FOR_PYTHON)
-target_link_libraries(area ${Boost_LIBRARIES})
-set_target_properties(area PROPERTIES PREFIX "") 
+target_link_libraries(pyarea ${Boost_LIBRARIES})
+set_target_properties(pyarea PROPERTIES PREFIX "") 
+set_target_properties(pyarea PROPERTIES OUTPUT_NAME "pyarea") 
 
-# this figures out where to install the Python modules
-execute_process(
-    COMMAND python -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())"
-    OUTPUT_VARIABLE Python_site_packages
-    OUTPUT_STRIP_TRAILING_WHITESPACE
-)
+message(STATUS "Python module will be installed to: " ${MODPY_SITEPKG})
 
-# strip away /usr/local/ because that is what CMAKE_INSTALL_PREFIX is set to
-# also, since there is no leading "/", it makes ${Python_site_packages} a relative path.
-STRING(REGEX REPLACE "/usr/local/(.*)$" "\\1" Python_site_packages "${Python_site_packages}" )
-STRING(REGEX REPLACE "/usr/(.*)$" "\\1" Python_site_packages "${Python_site_packages}" )
-
-message(STATUS "Python module will be installed to: " ${CMAKE_INSTALL_PREFIX}/${Python_site_packages})
-
 # this installs the python library
 install(
-    TARGETS area
-    LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/${Python_site_packages}
+    TARGETS pyarea
+    LIBRARY DESTINATION ${MODPY_SITEPKG}
 )
