openbsd-ports/devel/subversion/patches/patch-Makefile_in
alek 88721f10ed Update to 1.2.0
From Sigfred Haversen <bsdlist@mumak.com> (MAINTAINER)

ok msf@
2005-07-04 22:22:00 +00:00

49 lines
2.2 KiB
Plaintext

$OpenBSD: patch-Makefile_in,v 1.2 2005/07/04 22:22:00 alek Exp $
--- Makefile.in.orig Mon May 9 07:56:09 2005
+++ Makefile.in Wed Jun 22 02:08:50 2005
@@ -66,8 +66,8 @@ 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!!PYTHON_VER!!/site-packages/libsvn
+swig_pydir_extra = @libdir@/python!!PYTHON_VER!!/site-packages/svn
swig_pldir = @libdir@/svn-perl
swig_rbdir = $(SWIG_RB_SITE_ARCH_DIR)/svn/ext
@@ -143,7 +143,23 @@ MKDIR = @MKDIR@
# the EXTRA_ exist so that extra flags can be passed at 'make' time
CFLAGS = @CFLAGS@ $(EXTRA_CFLAGS)
CPPFLAGS = @CPPFLAGS@ $(EXTRA_CPPFLAGS)
-LDFLAGS = @LDFLAGS@ $(EXTRA_LDFLAGS)
+LDFLAGS = -L!!WRKBUILD!!/subversion/libsvn_client/.libs \
+ -L!!WRKBUILD!!/subversion/libsvn_delta/.libs \
+ -L!!WRKBUILD!!/subversion/libsvn_diff/.libs \
+ -L!!WRKBUILD!!/subversion/libsvn_fs/.libs \
+ -L!!WRKBUILD!!/subversion/libsvn_fs_base/.libs \
+ -L!!WRKBUILD!!/subversion/libsvn_fs_fs/.libs \
+ -L!!WRKBUILD!!/subversion/libsvn_ra/.libs \
+ -L!!WRKBUILD!!/subversion/libsvn_ra_dav/.libs \
+ -L!!WRKBUILD!!/subversion/libsvn_ra_local/.libs \
+ -L!!WRKBUILD!!/subversion/libsvn_ra_svn/.libs \
+ -L!!WRKBUILD!!/subversion/libsvn_repos/.libs \
+ -L!!WRKBUILD!!/subversion/libsvn_subr/.libs \
+ -L!!WRKBUILD!!/subversion/libsvn_wc/.libs \
+ -L!!WRKBUILD!!/subversion/bindings/swig/perl/libsvn_swig_perl/.libs \
+ -L!!WRKBUILD!!/subversion/bindings/swig/python/libsvn_swig_py/.libs \
+ -L!!WRKBUILD!!/subversion/bindings/swig/python/.libs \
+ @LDFLAGS@ $(EXTRA_LDFLAGS)
COMPILE = $(CC) $(CPPFLAGS) $(CFLAGS) $(INCLUDES)
COMPILE_CXX = $(CXX) $(CPPFLAGS) $(CFLAGS) $(CXXFLAGS) $(INCLUDES)
@@ -321,7 +337,7 @@ local-install: @INSTALL_RULES@
### HACK!! Find a better way to do this
revision-install:
- subversion/svnversion/svnversion $(top_srcdir) /repos/svn/trunk > $(DESTDIR)$(includedir)/subversion-1/svn-revision.txt
+ env LD_LIBRARY_PATH=${PREFIX}/lib subversion/svnversion/svnversion $(top_srcdir) /repos/svn/trunk > $(DESTDIR)$(includedir)/subversion-1/svn-revision.txt
install-static: @INSTALL_STATIC_RULES@