From: Bob Weinand <bobwei9@hotmail.com>
Date: Wed, 25 Jun 2014 11:56:45 +0000 (+0200)
Subject: Merge sapi/phpdbg into PHP-5.6
X-Git-Tag: PRE_PHPNG_MERGE~157^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=09b2510df63c2538bc2933405c452ac94442e1be;p=php

Merge sapi/phpdbg into PHP-5.6
---

09b2510df63c2538bc2933405c452ac94442e1be
diff --cc sapi/phpdbg/Makefile.frag
index d787b0fb18,0000000000..b276aaaa53
mode 100644,000000..100644
--- a/sapi/phpdbg/Makefile.frag
+++ b/sapi/phpdbg/Makefile.frag
@@@ -1,39 -1,0 +1,42 @@@
 +phpdbg: $(BUILD_BINARY)
 +
 +phpdbg-shared: $(BUILD_SHARED)
 +
 +$(BUILD_SHARED): $(PHP_GLOBAL_OBJS) $(PHP_BINARY_OBJS) $(PHP_PHPDBG_OBJS)
 +	$(BUILD_PHPDBG_SHARED)
 +
 +$(BUILD_BINARY): $(PHP_GLOBAL_OBJS) $(PHP_BINARY_OBJS) $(PHP_PHPDBG_OBJS)
 +	$(BUILD_PHPDBG)
 +
 +%.c: %.y
 +%.c: %.l
 +
 +$(builddir)/phpdbg_lexer.lo: $(srcdir)/phpdbg_parser.h
 +
 +$(srcdir)/phpdbg_lexer.c: $(srcdir)/phpdbg_lexer.l
 +	@(cd $(top_srcdir); $(RE2C) $(RE2C_FLAGS) --no-generation-date -cbdFo $(srcdir)/phpdbg_lexer.c $(srcdir)/phpdbg_lexer.l)
 +
 +$(srcdir)/phpdbg_parser.h: $(srcdir)/phpdbg_parser.c
 +$(srcdir)/phpdbg_parser.c: $(srcdir)/phpdbg_parser.y
 +	@$(YACC) -p phpdbg_ -v -d $(srcdir)/phpdbg_parser.y -o $@
 +
 +install-phpdbg: $(BUILD_BINARY)
 +	@echo "Installing phpdbg binary:         $(INSTALL_ROOT)$(bindir)/"
 +	@$(mkinstalldirs) $(INSTALL_ROOT)$(bindir)
 +	@$(mkinstalldirs) $(INSTALL_ROOT)$(localstatedir)/log
 +	@$(mkinstalldirs) $(INSTALL_ROOT)$(localstatedir)/run
 +	@$(INSTALL) -m 0755 $(BUILD_BINARY) $(INSTALL_ROOT)$(bindir)/$(program_prefix)phpdbg$(program_suffix)$(EXEEXT)
++	@echo "Installing phpdbg man page:       $(INSTALL_ROOT)$(mandir)/man1/"
++	@$(mkinstalldirs) $(INSTALL_ROOT)$(mandir)/man1
++	@$(INSTALL_DATA) sapi/phpdbg/phpdbg.1 $(INSTALL_ROOT)$(mandir)/man1/$(program_prefix)phpdbg$(program_suffix).1
 +
 +clean-phpdbg:
 +	@echo "Cleaning phpdbg object files ..."
 +	find sapi/phpdbg/ -name *.lo -o -name *.o | xargs rm -f
 +
 +test-phpdbg:
 +	@echo "Running phpdbg tests ..."
 +	@$(top_builddir)/sapi/cli/php sapi/phpdbg/tests/run-tests.php --phpdbg sapi/phpdbg/phpdbg
 +
 +.PHONY: clean-phpdbg test-phpdbg
 +
diff --cc sapi/phpdbg/phpdbg.1
index 0000000000,5e4d144c83..5e4d144c83
mode 000000,100644..100644
--- a/sapi/phpdbg/phpdbg.1
+++ b/sapi/phpdbg/phpdbg.1