[Rt-commit] rt branch, psgi, updated. rt-3.9.4-287-g67c60dc

[Alex Vandiver]

The branch, psgi has been updated
       via  67c60dc49fb13aa8aa4f22b83afdb79d9763ea97 (commit)
       via  9fdfcc7eaa8a9f22f3ce4ae067ac56d0226e6e99 (commit)
      from  8db66f0c4ed2bddde2fc79f841c002066562c3c8 (commit)

Summary of changes:
 Makefile.in |   21 ++++++++++-----------
 1 files changed, 10 insertions(+), 11 deletions(-)

- Log -----------------------------------------------------------------
commit 9fdfcc7eaa8a9f22f3ce4ae067ac56d0226e6e99
Author: Alex Vandiver <alexmv at bestpractical.com>
Date:   Fri Nov 5 06:33:41 2010 -0400

    Sort SYSTEM_BINARIES

diff --git a/Makefile.in b/Makefile.in
index 57d27f7..4fc2e16 100755
--- a/Makefile.in
+++ b/Makefile.in
@@ -162,18 +162,19 @@ BINARIES		=	$(RT_MODPERL_HANDLER) \
 
 
 SYSTEM_BINARIES		=	rt-attributes-viewer \
+				rt-clean-sessions \
 				rt-dump-database \
-				rt-setup-database \
-				rt-setup-fulltext-index \
-				rt-fulltext-indexer \
-				rt-email-digest \
 				rt-email-dashboards \
+				rt-email-digest \
 				rt-email-group-admin \
+				rt-fulltext-indexer \
 				rt-server \
+				rt-server.fcgi \
 				rt-session-viewer \
-				rt-test-dependencies \
-				rt-clean-sessions \
+				rt-setup-database \
+				rt-setup-fulltext-index \
 				rt-shredder \
+				rt-test-dependencies \
 				rt-validator
 
 

commit 67c60dc49fb13aa8aa4f22b83afdb79d9763ea97
Author: Alex Vandiver <alexmv at bestpractical.com>
Date:   Fri Nov 5 06:34:04 2010 -0400

    standalone_httpd now lives in sbin

diff --git a/Makefile.in b/Makefile.in
index 4fc2e16..17ca548 100755
--- a/Makefile.in
+++ b/Makefile.in
@@ -128,8 +128,6 @@ RT_READABLE_DIR_MODE	=	0755
 
 # RT_MODPERL_HANDLER is the mason handler script for mod_perl
 RT_MODPERL_HANDLER	=	webmux.pl
-# RT_STANDALONE_SERVER is a stand-alone HTTP server
-RT_STANDALONE_SERVER	=	standalone_httpd
 # RT_SPEEDYCGI_HANDLER is the mason handler script for SpeedyCGI
 RT_SPEEDYCGI_HANDLER	=	mason_handler.scgi
 # RT_FASTCGI_HANDLER is the mason handler script for FastCGI
@@ -151,7 +149,6 @@ BINARIES		=	$(RT_MODPERL_HANDLER) \
 				$(RT_MAILGATE_BIN) \
 				$(RT_CLI_BIN) \
 				$(RT_CRON_BIN) \
-				$(RT_STANDALONE_SERVER) \
 				$(RT_SPEEDYCGI_HANDLER) \
 				$(RT_FASTCGI_HANDLER) \
 				$(RT_FASTCGI_SERVER) \
@@ -175,7 +172,8 @@ SYSTEM_BINARIES		=	rt-attributes-viewer \
 				rt-setup-fulltext-index \
 				rt-shredder \
 				rt-test-dependencies \
-				rt-validator
+				rt-validator \
+				standalone_httpd
 
 
 ETC_FILES		=	acl.Pg \
@@ -492,7 +490,7 @@ reconfigure:
 	./configure
 
 start-httpd:
-	$(PERL) bin/standalone_httpd &
+	$(PERL) sbin/standalone_httpd &
 
 start-server:
 	$(PERL) sbin/rt-server &

-----------------------------------------------------------------------