diff options
| author | msheby <msheby@cinecert.com> | 2008-10-23 22:31:43 +0000 |
|---|---|---|
| committer | msheby <> | 2008-10-23 22:31:43 +0000 |
| commit | 924ebef758b5d8e7d296aab70c65387109795c63 (patch) | |
| tree | eddd12a5554293543411297f67dd4348e3472810 | |
| parent | 02be6b0940749863db32c0b00698fd25b5ab6640 (diff) | |
Update OpenBSD hack.
| -rw-r--r-- | m4/az_python.m4 | 1 | ||||
| -rw-r--r-- | src/Makefile.am | 4 | ||||
| -rwxr-xr-x | win32/Makefile.mak | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/m4/az_python.m4 b/m4/az_python.m4 index b8bfb98..7133a8a 100644 --- 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 632784a..45f86bf 100644 --- 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 ee91a42..1d2e7bd 100755 --- a/win32/Makefile.mak +++ b/win32/Makefile.mak @@ -32,7 +32,7 @@ OBJDIR = . !endif
CXXFLAGS1 = /nologo /W3 /GR /EHsc /DWIN32 /DKM_WIN32 /D_CONSOLE /I. /I$(SRCDIR) /DASDCP_PLATFORM=\"win32\" \
- /D_CRT_SECURE_NO_WARNINGS /D_CRT_NONSTDC_NO_WARNINGS /DPACKAGE_VERSION=\"1.3.19a\" \
+ /D_CRT_SECURE_NO_WARNINGS /D_CRT_NONSTDC_NO_WARNINGS /DPACKAGE_VERSION=\"1.3.20\" \
/I$(WITH_OPENSSL)\inc32
LIB_EXE = lib.exe
|