Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4: Use the right path for the suggested PHP invocation in ext_skel.
esr2587758 · May 1, 2014 · eb46096 · eb46096
2 parents 0842200 + 941c39b
commit eb46096
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/ext/ext_skel b/ext/ext_skel
@@ -288,7 +288,7 @@ To use your new extension, you will have to execute the following steps:
 3.  $ ./buildconf
 4.  $ ./configure --[with|enable]-$extname
 5.  $ make
-6.  $ ./php -f ext/$extname/$extname.php
+6.  $ ./sapi/cli/php -f ext/$extname/$extname.php
 7.  $ vi ext/$extname/$extname.c
 8.  $ make