You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by jc...@apache.org on 2017/07/12 00:13:55 UTC
svn commit: r1801667 - in /httpd/httpd/trunk: ./ Makefile.in
Author: jchampion
Date: Wed Jul 12 00:13:55 2017
New Revision: 1801667
URL: http://svn.apache.org/viewvc?rev=1801667&view=rev
Log:
Makefile.in: merge typo fix from test-integration branch
Modified:
httpd/httpd/trunk/ (props changed)
httpd/httpd/trunk/Makefile.in
Propchange: httpd/httpd/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jul 12 00:13:55 2017
@@ -3,5 +3,5 @@
/httpd/httpd/branches/trunk-buildconf-noapr:1780253-1795930
/httpd/httpd/branches/trunk-openssl-threadid:1791053-1791848
/httpd/httpd/branches/trunk-override-index:1793921-1793931
-/httpd/httpd/branches/trunk-test-integration:1777251-1782067
+/httpd/httpd/branches/trunk-test-integration:1777251-1801666
/httpd/httpd/branches/wombat-integration:723609-723841
Modified: httpd/httpd/trunk/Makefile.in
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/Makefile.in?rev=1801667&r1=1801666&r2=1801667&view=diff
==============================================================================
--- httpd/httpd/trunk/Makefile.in (original)
+++ httpd/httpd/trunk/Makefile.in Wed Jul 12 00:13:55 2017
@@ -328,7 +328,7 @@ check-conf:
if [ -f $$i ] ; then \
( \
n_lm=`awk 'BEGIN {n=0} /@@LoadModule@@/ {n+=1} END {print n}' < $$i`; \
- if test $$n_lm -eq 0 -o "x$(MPM_MODULE)$(DSO_MODULES)" = "x"; then \
+ if test $$n_lm -eq 0 -o "x$(MPM_MODULES)$(DSO_MODULES)" = "x"; then \
sed -e 's#@@ServerRoot@@#$(top_builddir)/check#g' \
-e 's#@@Port@@#$(PORT)#g' \
-e 's#@@SSLPort@@#$(SSLPORT)#g' \