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

[PATCH] correct substition in hot-backup.py.in

From: Jani Averbach <jaa_at_cc.jyu.fi>
Date: 2003-02-08 00:52:47 CET

Hello!

I changed @prefix@ to @SVN_BINDIR@ in hot-backup.py.in because @prefix@
won't follow configure's options (--exec-prefix and --bindir).
This is not perfect solution because this won't follow of ie.
"make exec_prefix=/foobar install".

" Naeser's Law:
        You can make it foolproof, but you can't make it damnfoolproof.
"

I have tested the change with
./configure
./configure --prefix=...
./configure --exec-prefix
./configure --bindir
./configure --prefix --exec-prefix
./configure --prefix --exec-prefix --bindir

Thanks to pretzelgod for helping with that.

BR, Jani

Log:

Changed @prefix@/bin/svnlook to @SVN_BINDIR@ because @prefix@ won't honor
configure's --bindir and --exec-prefix options.

* tools/backup/hot-backup.py.in:
  @prefix@ -> @SVN_BINDIR@

* configure.in:
  added creation of SVN_BINDIR

Index: tools/backup/hot-backup.py.in
===================================================================
--- tools/backup/hot-backup.py.in (revision 4788)
+++ tools/backup/hot-backup.py.in (working copy)
@@ -28,7 +28,7 @@
 # Global Settings

 # Path to svnlook utility
-svnlook = "@prefix@/bin/svnlook"
+svnlook = "@SVN_BINDIR@/svnlook"

 # Path to db_archive program
 db_archive = "/usr/local/BerkeleyDB.4.0/bin/db_archive"
Index: configure.in
===================================================================
--- configure.in (revision 4788)
+++ configure.in (working copy)
@@ -58,6 +58,26 @@
 dnl Grab the libtool macros
 sinclude(ac-helpers/libtool.m4)

+
+dnl Create SVN_BINDIR for proper substitution
+if test "${bindir}" = '${exec_prefix}/bin'; then
+ if test "${exec_prefix}" = "NONE"; then
+ if test "${prefix}" = "NONE"; then
+ SVN_BINDIR="${ac_default_prefix}/bin"
+ else
+ SVN_BINDIR="${prefix}/bin"
+ fi
+ else
+ SVN_BINDIR="${exec_prefix}/bin"
+ fi
+else
+ SVN_BINDIR="${bindir}"
+fi
+
+eval SVN_BINDIR=${SVN_BINDIR}
+AC_SUBST(SVN_BINDIR)
+
+
 dnl Generate config.nice early (before the args are munged)
 SVN_CONFIG_NICE(config.nice)

--
Jani Averbach
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sat Feb 8 00:53:31 2003

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