cvs: phpdoc /scripts file-entities.php.in

hholzgra Wed Aug 7 06:31:17 2002 EDT Modified files: /phpdoc/scripts file-entities.php.in Log: the '.../script' part originates from getcwd() and not from whatever configure puts into the placeholders, so the right place to strip it off is in abs_path() Index: phpdoc/scripts/file-entities.php.in diff -u phpdoc/scripts/file-entities.php.in:1.2 phpdoc/scripts/file-entities.php.in:1.3 --- phpdoc/scripts/file-entities.php.in:1.2 Sat Aug 3 12:20:54 2002 +++ phpdoc/scripts/file-entities.php.in Wed Aug 7 06:31:17 2002 @@ -17,7 +17,7 @@ # | Gabor Hojtsy <goba@php.net> | # +----------------------------------------------------------------------+ # -# $Id: file-entities.php.in,v 1.2 2002/08/03 16:20:54 goba Exp $ +# $Id: file-entities.php.in,v 1.3 2002/08/07 10:31:17 hholzgra Exp $ */ /** @@ -55,13 +55,11 @@ // needed. Also use absolute path to have meaningful error messages $out_dir = preg_replace("!^/cygdrive/(\\w)/!", "\\1:/", "@WORKDIR@"); $out_dir = str_replace("\\", "/", abs_path($out_dir)); -$out_dir = preg_replace("!/scripts$!", "", $out_dir); // The source directory is passed in the 5th argument counting from backwards. // All backslashes are converted, and the possible "scripts" dirname at the // end is omitted $srcdir = str_replace("\\", "/", abs_path("@SRCDIR@")); -$srcdir = preg_replace("!/scripts$!", "", $srcdir); // The translation dir is passed as the 6th argument, counting // from the end of the argument list @@ -161,8 +159,9 @@ // This is already an absolute path (begins with / or a drive letter) if (preg_match("!^(/|\\w:)!", $path)) { return $path; } - // Get directory parts - $absdirs = explode("/", getcwd()); + // Get directory parts$srcdir); + + $absdirs = explode("/", preg_replace("!/scripts$!", "", getcwd())); $dirs = explode("/", $path); // Generate array representation of absolute path