b30fe153de
'svn upgrade'), regen patches, and add a patch queued for 1.7.2 which fixes 'svn update' for symlinks.
36 lines
1.4 KiB
Plaintext
36 lines
1.4 KiB
Plaintext
$OpenBSD: patch-Makefile_in,v 1.13 2011/10/23 09:51:59 stsp Exp $
|
|
--- Makefile.in.orig Sat Jul 16 13:50:53 2011
|
|
+++ Makefile.in Sat Oct 22 10:40:12 2011
|
|
@@ -85,11 +85,11 @@ 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
|
|
-toolsdir = @bindir@/svn-tools
|
|
+toolsdir = @bindir@
|
|
|
|
javahl_javadir = @libdir@/svn-javahl
|
|
javahl_javahdir = @libdir@/svn-javahl/include
|
|
@@ -134,13 +134,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@
|