diff options
| author | Johannes Schlüter <johannes@php.net> | 2012-04-14 00:31:00 +0200 |
|---|---|---|
| committer | Johannes Schlüter <johannes@php.net> | 2012-04-14 00:31:00 +0200 |
| commit | 6ecac269728360180a2813e75dfbe8338a05a27a (patch) | |
| tree | 0d5d67fcef87c3e8287075bddad42a20202258c0 /win32 | |
| parent | de6dfe5bbd197e6387f0044b857b518e29e27283 (diff) | |
| parent | 21d314a767561204cdeba896b85e61e1bb6cafac (diff) | |
| download | php-git-6ecac269728360180a2813e75dfbe8338a05a27a.tar.gz | |
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
Rename README.SVN-RULES to README.GIT-RULES, here, too
Diffstat (limited to 'win32')
| -rw-r--r-- | win32/build/confutils.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/win32/build/confutils.js b/win32/build/confutils.js index 8c4054da0b..c0a1ce895b 100644 --- a/win32/build/confutils.js +++ b/win32/build/confutils.js @@ -65,7 +65,7 @@ if (MODE_PHPIZE) { WScript.Quit(10);
}
} else {
- if (!FSO.FileExists("README.SVN-RULES")) {
+ if (!FSO.FileExists("README.GIT-RULES")) {
STDERR.WriteLine("Must be run from the root of the php source");
WScript.Quit(10);
}
@@ -74,7 +74,7 @@ if (MODE_PHPIZE) { var CWD = WshShell.CurrentDirectory;
if (typeof(CWD) == "undefined") {
- CWD = FSO.GetParentFolderName(FSO.GetAbsolutePathName("README.SVN-RULES"));
+ CWD = FSO.GetParentFolderName(FSO.GetAbsolutePathName("README.GIT-RULES"));
}
/* defaults; we pick up the precise versions from configure.in */
|