openbsd-ports/devel/subversion/patches/patch-Makefile_in
jeremy f3ba7fefc2 Handle changes caused by splitting the ruby port and bump
OK jcs@, landry@, jasper@, sthen@
2010-09-23 22:10:28 +00:00

37 lines
1.4 KiB
Plaintext

$OpenBSD: patch-Makefile_in,v 1.11 2010/09/23 22:12:10 jeremy Exp $
--- Makefile.in.orig Mon Feb 16 08:10:48 2009
+++ Makefile.in Thu Sep 16 14:04:24 2010
@@ -76,12 +76,12 @@ swig_pl_libdir = @libdir@
swig_rb_libdir = @libdir@
### these possibly need further discussion
-swig_pydir = @libdir@/svn-python/libsvn
-swig_pydir_extra = @libdir@/svn-python/svn
+swig_pydir = @libdir@/python${MODPY_VERSION}/site-packages/libsvn
+swig_pydir_extra = @libdir@/python${MODPY_VERSION}/site-packages/svn
swig_pldir = @libdir@/svn-perl
swig_rbdir = $(SWIG_RB_SITE_ARCH_DIR)/svn/ext
contribdir = @bindir@/svn-contrib
-toolsdir = @bindir@/svn-tools
+toolsdir = @bindir@
javahl_javadir = @libdir@/svn-javahl
javahl_javahdir = @libdir@/svn-javahl/include
@@ -122,13 +122,13 @@ APACHE_LDFLAGS = @APACHE_LDFLAGS@
SWIG = @SWIG@
SWIG_PY_INCLUDES = @SWIG_PY_INCLUDES@ -I$(SWIG_SRC_DIR)/python/libsvn_swig_py
SWIG_PY_COMPILE = @SWIG_PY_COMPILE@
-SWIG_PY_LINK = @SWIG_PY_LINK@
-SWIG_PY_LIBS = @SWIG_PY_LIBS@
+SWIG_PY_LINK = @SWIG_PY_LINK@ -L@libdir@
+SWIG_PY_LIBS = -lpython${MODPY_VERSION}
SWIG_PL_INCLUDES = @SWIG_PL_INCLUDES@
SWIG_RB_INCLUDES = @SWIG_RB_INCLUDES@ -I$(SWIG_SRC_DIR)/ruby/libsvn_swig_ruby
SWIG_RB_COMPILE = @SWIG_RB_COMPILE@
SWIG_RB_LINK = @SWIG_RB_LINK@
-SWIG_RB_LIBS = @SWIG_RB_LIBS@
+SWIG_RB_LIBS = -lruby18
SWIG_RB_SITE_LIB_DIR = @SWIG_RB_SITE_LIB_DIR@
SWIG_RB_SITE_ARCH_DIR = @SWIG_RB_SITE_ARCH_DIR@
SWIG_RB_TEST_VERBOSE = @SWIG_RB_TEST_VERBOSE@