fix a couple of deprecated functions (distutil.sysconfig, numpy.distu…

…tils)

libkd/Makefile

@@ -101,11 +101,11 @@ spherematch_c$(PYTHON_SO_EXT): pyspherematch.c setup.py $(SLIB)
 # pyspherematch.c includes Python.h -- so have to make sure to add Python.h include path
 # (otherwise, get an obscure message from numpy about needing a python built with unicode)
 ifeq ($(MAKECMDGOALS),spherematch_c$(PYTHON_SO_EXT))
-  CFLAGS += $(shell $(PYTHON) -c "from distutils.sysconfig import *; print('-I'+get_python_inc())")
+  CFLAGS += $(shell $(PYTHON_CONFIG) --cflags)
   DEP_OBJ += $(PYSPHEREMATCH_OBJ)
 endif
 ifeq ($(MAKECMDGOALS),pyspherematch)
-  CFLAGS += $(shell $(PYTHON) -c "from distutils.sysconfig import *; print('-I'+get_python_inc())")
+  CFLAGS += $(shell $(PYTHON_CONFIG) --cflags)
   DEP_OBJ += $(PYSPHEREMATCH_OBJ)
 endif
 

libkd/setup.py

@@ -5,8 +5,8 @@
 import numpy
 import os.path
 
-from numpy.distutils.misc_util import get_numpy_include_dirs
-numpy_inc = get_numpy_include_dirs()
+from numpy import get_include
+numpy_inc = [get_include()]
 
 def strlist(s, split=' '):
     lst = s.split(split)

util/makefile.common

@@ -5,6 +5,7 @@ INCLUDE_BASE_DIR := $(BASEDIR)/include
 INCLUDE_DIR := $(INCLUDE_BASE_DIR)/astrometry
 
 PYTHON ?= python3
+PYTHON_CONFIG ?= python3-config
 INSTALL_DIR ?= /usr/local/astrometry
 # Put INSTALL_DIR in the environment of commands run by Make.
 export INSTALL_DIR