Rebuild for jessie-backports

[git.ikiwiki.info.git] / t / cvs.t

diff --git a/t/cvs.t b/t/cvs.t
index 43a2ca3a81f77e07afb997c3e118e64957ba1e81..6acafd701fe39f29ea3732983784439c929eefad 100755 (executable)
--- a/t/cvs.t
+++ b/t/cvs.t
@@ -609,10 +609,10 @@ sub _generate_and_configure_post_commit_hook {
 
        require IkiWiki::Wrapper;
        if ($installed) {
 
        require IkiWiki::Wrapper;
        if ($installed) {

-               $IkiWiki::program_to_wrap = 'ikiwiki.out';
+               $IkiWiki::program_to_wrap = `which ikiwiki`;

        }
        else {
        }
        else {

-               $IkiWiki::program_to_wrap = `which ikiwiki`;
+               $IkiWiki::program_to_wrap = './ikiwiki.out';

        }
        # XXX substitute its interpreter to Makefile's $(PERL)
        # XXX best solution: do this to all scripts during build
        }
        # XXX substitute its interpreter to Makefile's $(PERL)
        # XXX best solution: do this to all scripts during build


@@ -708,5 +708,5 @@ sub stripext {
 }
 
 sub _wrapper_paths {
 }
 
 sub _wrapper_paths {

-       return qq{newenviron[i++]="PERL5LIB=$ENV{PERL5LIB}";};
+       return qq{addenv("PERL5LIB", "$ENV{PERL5LIB}");};

 }
 }