Changeset 570

Timestamp:

Mar 14, 2008, 4:12:40 PM (14 years ago)

Author:

Peter Johansson

Message:

fixing issues when builddir!=srcdir

Location:

trunk

Files:

• lib/Makefile.am (modified) (2 diffs)
• test/check_repo_status.sh.in (modified) (3 diffs)

trunk/lib/Makefile.am

@@ -52 +52 @@
 
 if HAVE_SVN_WC
-subversion_info.cc: subversion_info.cc.tmp
+@srcdir@/subversion_info.cc: subversion_info.cc.tmp
   @$(SHELL) @top_srcdir@/build_support/move-if-change subversion_info.cc.tmp \
-  subversion_info.cc
+  @srcdir@/subversion_info.cc
 
 subversion_info.cc.tmp: FORCE
@@ -61 +61 @@
   year=`svn info $(top_srcdir)|$(SED) -n  's/.*Date: \(.*\)-..-.*/\1/p'`;\
   $(SED) -e 's/sub_2_svn_revision/'$$revision'/g' \
-  -e 's/sub_2_svn_year/'$$year'/g'  subversion_info.cc.in >> $@ ;
+  -e 's/sub_2_svn_year/'$$year'/g'  @srcdir@/subversion_info.cc.in >> $@ ;
 endif
 

trunk/test/check_repo_status.sh.in

@@ -5 +5 @@
 
 # Copyright (C) 2007 Jari Häkkinen, Peter Johansson
+# Copyright (C) 2008 Peter Johansson
 #
 # This file is part of svndigest, http://trac.thep.lu.se/svndigest
@@ -27 +28 @@
 
 # retrieve last revision in test repository
-rev=`cat repo/db/current`
+rev=`cat @srcdir@/repo/db/current`
 rev=${rev%% *}
 
 # check if the last test revision is a part of the svndigest repository
-status_return=`svn status -v repo/db/revs/$rev`
+status_return=`svn status -v @srcdir@/repo/db/revs/$rev`
 # logic: (file does not exist) || (file exists but not in revision control)
 if [[ ${#status_return} -eq 0 || ${status_return:0:1} = "?" ]]; then
@@ -50 +51 @@
     echo "ERROR:    svn add test/repo/db/revs/$rev test/repo/db/revprops/$rev"
     let rev--
-    status_return=`svn status -v repo/db/revs/$rev`
+    status_return=`svn status -v @srcdir@/repo/db/revs/$rev`
 done