Merge branch 'master' into preload

dstogov · dstogov · commit b5ffba0fafb4 · 2018-10-24T12:46:28.000+03:00
* master:
  Fixed build in directory different from source
diff --git a/sapi/phpdbg/phpdbg_parser.y b/sapi/phpdbg/phpdbg_parser.y
@@ -39,9 +39,6 @@ typedef void* yyscan_t;
 #endif
 }
 
-%output  "sapi/phpdbg/phpdbg_parser.c"
-%defines "sapi/phpdbg/phpdbg_parser.h"
-
 %token T_EVAL       "eval"
 %token T_RUN        "run"
 %token T_SHELL      "shell"

Original file line number	Diff line number	Diff line change
`@@ -39,9 +39,6 @@ typedef void* yyscan_t;`
`39`	`39`	`#endif`
`40`	`40`	`}`
`41`	`41`
`42`		`-%output "sapi/phpdbg/phpdbg_parser.c"`
`43`		`-%defines "sapi/phpdbg/phpdbg_parser.h"`
`44`		`-`
`45`	`42`	`%token T_EVAL "eval"`
`46`	`43`	`%token T_RUN "run"`
`47`	`44`	`%token T_SHELL "shell"`