[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: [PATCH] svn-config installedness test fails when symlinked

From: Branko Čibej <brane_at_xbc.nu>
Date: 2002-09-10 23:19:15 CEST

Marcus Comstedt wrote:

>Since everthing in the Makefile relating to svn-config is generated by
>the strange Python-thingy though, I don't know where to add code which
>injects this knowledge into the script as it is installed (a very
>simple sed command will do the trick, if I just can figure out where
>to put it).
>
>
No changes are necessary in gen[-_]make.py. Try this patch, and don't
forget to fill in the necessary magic in INSTALL_SVN_CONFIG:

Index: Makefile.in
===================================================================
--- Makefile.in
+++ Makefile.in 2002-09-10 23:15:09.000000000 +0200
@@ -25,6 +25,7 @@
 fs_libdir= @libdir@
 bindir = @bindir@
 fs_bindir=@bindir@
+svn_configdir=@bindir@
 includedir = @includedir@
 mandir = @mandir@
 srcdir = @srcdir@
@@ -79,6 +80,7 @@
 INSTALL_FS_LIB = $(INSTALL_LIB)
 INSTALL_BIN = $(LIBTOOL) --mode=install $(INSTALL)
 INSTALL_FS_BIN = $(INSTALL_BIN)
+INSTALL_SVN_CONFIG = <magic here>
 INSTALL_INCLUDE = $(INSTALL) -m 644
 INSTALL_MOD_SHARED = @APXS@ -i @MOD_ACTIVATION@
 INSTALL_MOD_STATIC = $(INSTALL) -m 644
Index: build.conf
===================================================================
--- build.conf
+++ build.conf 2002-09-10 23:03:59.000000000 +0200
@@ -442,6 +442,7 @@
 [svn-config]
 type = script
 path = .
+install = svn-config
 sources = svn-config

Index: configure.in
===================================================================
--- configure.in
+++ configure.in 2002-09-10 23:05:11.000000000 +0200
@@ -139,7 +139,7 @@
                     $SVN_FS_WANT_DB_PATCH)

 # Only add *_APACHE_RULE if we also have db, since mod_dav_svn depends on it.
-INSTALL_STATIC_RULES="install-bin install-docs"
+INSTALL_STATIC_RULES="install-bin install-svn-config install-docs"
 INSTALL_RULES="install-base-lib install-lib install-include install-static"
 BUILD_RULES="base-lib lib bin test"
 if test "$svn_lib_berkeley_db" = "yes"; then

-- 
Brane Čibej   <brane_at_xbc.nu>   http://www.xbc.nu/brane/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Tue Sep 10 23:20:10 2002

This is an archived mail posted to the Subversion Dev mailing list.