Update OpenBSD hack.

diff --git a/m4/az_python.m4 b/m4/az_python.m4
index b8bfb98cfea6c806238769e435be67850f67195b..7133a8ae827add32dc28f5bab94a04f34b925f44 100644 (file)
--- a/m4/az_python.m4
+++ b/m4/az_python.m4
@@ -243,6 +243,7 @@ AC_DEFUN([AZ_PYTHON_CSPEC],
         az_python_cspec="${az_python_ccshared} ${az_python_includespec}"
         AC_SUBST([PYTHON_CSPEC], [${az_python_cspec}])
         AC_SUBST([PYTHON_CPPFLAGS], [${az_python_includespec}])
+        AC_SUBST([PYTHON_SHORTVERSION], ["${az_python_version}"])
         AC_MSG_RESULT([$PYTHON_CPPFLAGS])
     fi
 ])

diff --git a/src/Makefile.am b/src/Makefile.am
index 632784af0f2058f8dac831a74cf94c9c325ff91e..45f86bf731405b158f882023203f19af0b1c4c8c 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -26,7 +26,7 @@
 # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 AM_CPPFLAGS = -I/var/local/include -I/usr/local/include
-AM_LDFLAGS = -L/var/local/lib -L/usr/local/lib
+AM_LDFLAGS = -L./.libs -L/var/local/lib -L/usr/local/lib
 
 # list of all the header files that should be installed
 include_HEADERS = KM_error.h KM_fileio.h KM_log.h KM_memio.h KM_mutex.h \
@@ -71,7 +71,7 @@ libpyasdcp_la_CPPFLAGS = @PYTHON_CPPFLAGS@
 libpyasdcp_la_LDFLAGS = @PYTHON_LSPEC@
 libpyasdcp_la_LIBADD = libkumu.la libasdcp.la
 pyexecdir = @PYTHON_EXECDIR@
-pyexec_includedir = $(PYTHON_PREFIX)/Headers
+pyexec_includedir = $(PYTHON_PREFIX)/include/python$(PYTHON_SHORTVERSION)
 pyexec_include_HEADERS = kumu_python.h asdcp_python.h
 pyexec_LTLIBRARIES = kumu.la asdcp.la
 nodist_kumu_la_SOURCES = pykumu.cpp kumu_python.h

diff --git a/win32/Makefile.mak b/win32/Makefile.mak
index ee91a422597729dab8ca4c45267311638857afd8..1d2e7bd26c303c339d47882dbe4e8a5d59934337 100755 (executable)
--- a/win32/Makefile.mak
+++ b/win32/Makefile.mak
@@ -32,7 +32,7 @@ OBJDIR = .
 !endif\r
 \r
 CXXFLAGS1 = /nologo /W3 /GR /EHsc /DWIN32 /DKM_WIN32 /D_CONSOLE /I. /I$(SRCDIR) /DASDCP_PLATFORM=\"win32\" \\r
-       /D_CRT_SECURE_NO_WARNINGS /D_CRT_NONSTDC_NO_WARNINGS /DPACKAGE_VERSION=\"1.3.19a\" \\r
+       /D_CRT_SECURE_NO_WARNINGS /D_CRT_NONSTDC_NO_WARNINGS /DPACKAGE_VERSION=\"1.3.20\" \\r
        /I$(WITH_OPENSSL)\inc32\r
 \r
 LIB_EXE = lib.exe\r