Changeset 570 for trunk


Ignore:
Timestamp:
Mar 14, 2008, 4:12:40 PM (13 years ago)
Author:
Peter Johansson
Message:

fixing issues when builddir!=srcdir

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/lib/Makefile.am

    r569 r570  
    5252
    5353if HAVE_SVN_WC
    54 subversion_info.cc: subversion_info.cc.tmp
     54@srcdir@/subversion_info.cc: subversion_info.cc.tmp
    5555  @$(SHELL) @top_srcdir@/build_support/move-if-change subversion_info.cc.tmp \
    56   subversion_info.cc
     56  @srcdir@/subversion_info.cc
    5757
    5858subversion_info.cc.tmp: FORCE
     
    6161  year=`svn info $(top_srcdir)|$(SED) -n  's/.*Date: \(.*\)-..-.*/\1/p'`;\
    6262  $(SED) -e 's/sub_2_svn_revision/'$$revision'/g' \
    63   -e 's/sub_2_svn_year/'$$year'/g'  subversion_info.cc.in >> $@ ;
     63  -e 's/sub_2_svn_year/'$$year'/g'  @srcdir@/subversion_info.cc.in >> $@ ;
    6464endif
    6565
  • trunk/test/check_repo_status.sh.in

    r568 r570  
    55
    66# Copyright (C) 2007 Jari Häkkinen, Peter Johansson
     7# Copyright (C) 2008 Peter Johansson
    78#
    89# This file is part of svndigest, http://trac.thep.lu.se/svndigest
     
    2728
    2829# retrieve last revision in test repository
    29 rev=`cat repo/db/current`
     30rev=`cat @srcdir@/repo/db/current`
    3031rev=${rev%% *}
    3132
    3233# check if the last test revision is a part of the svndigest repository
    33 status_return=`svn status -v repo/db/revs/$rev`
     34status_return=`svn status -v @srcdir@/repo/db/revs/$rev`
    3435# logic: (file does not exist) || (file exists but not in revision control)
    3536if [[ ${#status_return} -eq 0 || ${status_return:0:1} = "?" ]]; then
     
    5051    echo "ERROR:    svn add test/repo/db/revs/$rev test/repo/db/revprops/$rev"
    5152    let rev--
    52     status_return=`svn status -v repo/db/revs/$rev`
     53    status_return=`svn status -v @srcdir@/repo/db/revs/$rev`
    5354done
    5455
Note: See TracChangeset for help on using the changeset viewer.