On Wed, May 14, 2014 at 07:26:20AM -0400, James McCoy wrote: > On Wed, May 14, 2014 at 03:35:50AM +0000, Daniel Shahaf wrote: > > James McCoy wrote on Tue, May 13, 2014 at 22:00:55 -0400: > > > I had tried the below patch but ran into some other issues that I didn't > > > have the time/experience to properly diagnose. > > > > There was no attachment. > > Attached.
There was extra cruft in that patch from a previous discussion. Only the Makefile.in bit is relevant. Trimmed patch attached. Cheers, -- James GPG Key: 4096R/331BA3DB 2011-12-05 James McCoy <james...@debian.org>
Index: branches/1.8.x/Makefile.in =================================================================== --- branches/1.8.x/Makefile.in (revision 1594444) +++ branches/1.8.x/Makefile.in (working copy) @@ -202,16 +202,18 @@ # export an env variable so that the tests can run without being installed TEST_SHLIB_VAR_JAVAHL=\ - if [ "@SVN_APR_SHLIB_PATH_VAR@" = "DYLD_LIBRARY_PATH" ]; then \ - for d in $(abs_builddir)/subversion/libsvn_*; do \ - if [ -n "$$DYLD_LIBRARY_PATH" ]; then \ - @SVN_APR_SHLIB_PATH_VAR@="$$@SVN_APR_SHLIB_PATH_VAR@:$$d/.libs"; \ - else \ - @SVN_APR_SHLIB_PATH_VAR@="$$d/.libs"; \ - fi; \ - done; \ - export @SVN_APR_SHLIB_PATH_VAR@; \ - fi; + case "@SVN_APR_SHLIB_PATH_VAR@" in \ + DYLD_LIBRARY_PATH|LD_LIBRARY_PATH) \ + for d in $(abs_builddir)/subversion/libsvn_*; do \ + if [ -n "$$@SVN_APR_SHLIB_PATH_VAR@" ]; then \ + @SVN_APR_SHLIB_PATH_VAR@="$$@SVN_APR_SHLIB_PATH_VAR@:$$d/.libs"; \ + else \ + @SVN_APR_SHLIB_PATH_VAR@="$$d/.libs"; \ + fi; \ + done; \ + export @SVN_APR_SHLIB_PATH_VAR@; \ + ;; \ + esac; # special compilation for files destined for cxxhl COMPILE_CXXHL_CXX = $(LIBTOOL) $(LTCXXFLAGS) --mode=compile $(COMPILE_CXX) $(LT_CFLAGS) $(CXXHL_INCLUDES) -o $@ -c @@ -302,16 +304,18 @@ # export an env variable so that the tests can run without being installed TEST_SHLIB_VAR_SWIG_PY=\ - if [ "@SVN_APR_SHLIB_PATH_VAR@" = "DYLD_LIBRARY_PATH" ]; then \ - for d in $(SWIG_PY_DIR)/libsvn_swig_py $(SWIG_PY_DIR)/../../../libsvn_*; do \ - if [ -n "$$DYLD_LIBRARY_PATH" ]; then \ - @SVN_APR_SHLIB_PATH_VAR@="$$@SVN_APR_SHLIB_PATH_VAR@:$$d/.libs"; \ - else \ - @SVN_APR_SHLIB_PATH_VAR@="$$d/.libs"; \ - fi; \ - done; \ - export @SVN_APR_SHLIB_PATH_VAR@; \ - fi; + case "@SVN_APR_SHLIB_PATH_VAR@" in \ + DYLD_LIBRARY_PATH|LD_LIBRARY_PATH) \ + for d in $(SWIG_PY_DIR)/libsvn_swig_py $(SWIG_PY_DIR)/../../../libsvn_*; do \ + if [ -n "$$@SVN_APR_SHLIB_PATH_VAR@" ]; then \ + @SVN_APR_SHLIB_PATH_VAR@="$$@SVN_APR_SHLIB_PATH_VAR@:$$d/.libs"; \ + else \ + @SVN_APR_SHLIB_PATH_VAR@="$$d/.libs"; \ + fi; \ + done; \ + export @SVN_APR_SHLIB_PATH_VAR@; \ + ;; \ + esac; # The path to generated and complementary source files for the SWIG # bindings. @@ -345,16 +349,18 @@ # export an env variable so that the tests can run without being installed TEST_SHLIB_VAR_SWIG_RB=\ - if [ "@SVN_APR_SHLIB_PATH_VAR@" = "DYLD_LIBRARY_PATH" ]; then \ - for d in $(SWIG_RB_DIR)/libsvn_swig_ruby $(SWIG_RB_DIR)/../../../libsvn_*; do \ - if [ -n "$$DYLD_LIBRARY_PATH" ]; then \ - @SVN_APR_SHLIB_PATH_VAR@="$$@SVN_APR_SHLIB_PATH_VAR@:$$d/.libs"; \ - else \ - @SVN_APR_SHLIB_PATH_VAR@="$$d/.libs"; \ - fi; \ - done; \ - export @SVN_APR_SHLIB_PATH_VAR@; \ - fi; + case "@SVN_APR_SHLIB_PATH_VAR@" in \ + DYLD_LIBRARY_PATH|LD_LIBRARY_PATH) \ + for d in $(SWIG_RB_DIR)/libsvn_swig_ruby $(SWIG_RB_DIR)/../../../libsvn_*; do \ + if [ -n "$$@SVN_APR_SHLIB_PATH_VAR@" ]; then \ + @SVN_APR_SHLIB_PATH_VAR@="$$@SVN_APR_SHLIB_PATH_VAR@:$$d/.libs"; \ + else \ + @SVN_APR_SHLIB_PATH_VAR@="$$d/.libs"; \ + fi; \ + done; \ + export @SVN_APR_SHLIB_PATH_VAR@; \ + ;; \ + esac; APXS = @APXS@
signature.asc
Description: Digital signature
