X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=rt%2FMakefile.in;h=f963faa2513d734520f6bc5dad6bbe74461e208c;hp=19a5f684962317a015b395c3878875bd97d57ec1;hb=c3da5cf1caa244937d280e0f406927103beef148;hpb=63a268637b2d51a8766412617724b9436439deb6

diff --git a/rt/Makefile.in b/rt/Makefile.in
index 19a5f6849..f963faa25 100644
--- a/rt/Makefile.in
+++ b/rt/Makefile.in
@@ -1,40 +1,40 @@
 # BEGIN BPS TAGGED BLOCK {{{
-# 
+#
 # COPYRIGHT:
-# 
-# This software is Copyright (c) 1996-2009 Best Practical Solutions, LLC
-#                                          <jesse@bestpractical.com>
-# 
+#
+# This software is Copyright (c) 1996-2011 Best Practical Solutions, LLC
+#                                          <sales@bestpractical.com>
+#
 # (Except where explicitly superseded by other copyright notices)
-# 
-# 
+#
+#
 # LICENSE:
-# 
+#
 # This work is made available to you under the terms of Version 2 of
 # the GNU General Public License. A copy of that license should have
 # been provided with this software, but in any event can be snarfed
 # from www.gnu.org.
-# 
+#
 # This work is distributed in the hope that it will be useful, but
 # WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 # General Public License for more details.
-# 
+#
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 # 02110-1301 or visit their web page on the internet at
 # http://www.gnu.org/licenses/old-licenses/gpl-2.0.html.
-# 
-# 
+#
+#
 # CONTRIBUTION SUBMISSION POLICY:
-# 
+#
 # (The following paragraph is not intended to limit the rights granted
 # to you to modify and distribute this software under the terms of
 # the GNU General Public License and is only of importance to you if
 # you choose to contribute your changes and enhancements to the
 # community by submitting them to Best Practical Solutions, LLC.)
-# 
+#
 # By intentionally submitting any modifications, corrections or
 # derivatives to this work, or any other work intended for use with
 # Request Tracker, to Best Practical Solutions, LLC, you confirm that
@@ -43,7 +43,7 @@
 # royalty-free, perpetual, license to use, copy, create derivative
 # works based on those contributions, and sublicense and distribute
 # those contributions and any derivatives thereof.
-# 
+#
 # END BPS TAGGED BLOCK }}}
 #
 # DO NOT HAND-EDIT the file named 'Makefile'. This file is autogenerated.
@@ -106,6 +106,7 @@ RT_LIB_PATH		=	@RT_LIB_PATH_R@
 RT_MAN_PATH		=	@RT_MAN_PATH_R@
 RT_VAR_PATH		=	@RT_VAR_PATH_R@
 RT_DOC_PATH		=	@RT_DOC_PATH_R@
+RT_FONT_PATH		=	@RT_FONT_PATH_R@
 RT_LOCAL_PATH		=	@RT_LOCAL_PATH_R@
 LOCAL_PLUGIN_PATH	=	@RT_LOCAL_PATH_R@/plugins
 LOCAL_ETC_PATH		=	@LOCAL_ETC_PATH_R@
@@ -134,6 +135,8 @@ RT_STANDALONE_SERVER	=	standalone_httpd
 RT_SPEEDYCGI_HANDLER	=	mason_handler.scgi
 # RT_FASTCGI_HANDLER is the mason handler script for FastCGI
 RT_FASTCGI_HANDLER	=	mason_handler.fcgi
+# RT_FASTCGI_SERVER is the FastCGI server
+RT_FASTCGI_SERVER	=	fastcgi_server
 # RT_WIN32_FASTCGI_HANDLER is the mason handler script for FastCGI
 RT_WIN32_FASTCGI_HANDLER	=	mason_handler.svc
 # RT's CLI
@@ -153,18 +156,21 @@ BINARIES		=	$(RT_MODPERL_HANDLER) \
 				$(RT_STANDALONE_SERVER) \
 				$(RT_SPEEDYCGI_HANDLER) \
 				$(RT_FASTCGI_HANDLER) \
+				$(RT_FASTCGI_SERVER) \
 				$(RT_WIN32_FASTCGI_HANDLER)
 
 
 
 
 
-SYSTEM_BINARIES		=	rt-dump-database \
+SYSTEM_BINARIES		=	rt-attributes-viewer \
+				rt-dump-database \
 				rt-setup-database \
 				rt-email-digest \
 				rt-email-dashboards \
 				rt-email-group-admin \
 				rt-server \
+				rt-session-viewer \
 				rt-test-dependencies \
 				rt-clean-sessions \
 				rt-shredder \
@@ -284,7 +290,7 @@ upgrade-instruct:
 
 upgrade: testdeps config-install dirs files-install fixperms upgrade-instruct
 
-upgrade-noclobber: config-install dirs libs-install html-install bin-install local-install doc-install fixperms
+upgrade-noclobber: config-install dirs libs-install html-install bin-install local-install doc-install font-install fixperms
 
 
 # {{{ dependencies
@@ -312,7 +318,7 @@ fixperms:
 	chmod $(RT_READABLE_DIR_MODE) $(DESTDIR)$(RT_BIN_PATH)
 
 	chmod 0755 $(DESTDIR)$(RT_ETC_PATH)
-	cd $(DESTDIR)$(RT_ETC_PATH) && chmod 0400 $(ETC_FILES)
+	cd $(DESTDIR)$(RT_ETC_PATH) && chmod 0400 $(ETC_FILES) || true
 
 	#TODO: the config file should probably be able to have its
 	# owner set separately from the binaries.
@@ -321,6 +327,8 @@ fixperms:
 
 	chmod 0440 $(DESTDIR)$(CONFIG_FILE)
 	chmod 0640 $(DESTDIR)$(SITE_CONFIG_FILE)
+	# Make this externally readable
+	chmod 0440 $(DESTDIR)$(RT_ETC_PATH)/initialdata
 
 	# Make the system binaries
 	cd $(DESTDIR)$(RT_BIN_PATH) && ( chmod 0755 $(BINARIES) ; chown $(BIN_OWNER) $(BINARIES);  chgrp $(RTGROUP) $(BINARIES))
@@ -349,6 +357,7 @@ fixperms:
 # {{{ dirs
 dirs:
 	$(INSTALL) -m 0755 -d $(DESTDIR)$(RT_LOG_PATH)
+	$(INSTALL) -m 0755 -d $(DESTDIR)$(RT_FONT_PATH)
 	$(INSTALL) -m 0770 -d $(DESTDIR)$(MASON_DATA_PATH)
 	$(INSTALL) -m 0770 -d $(DESTDIR)$(MASON_DATA_PATH)/cache
 	$(INSTALL) -m 0770 -d $(DESTDIR)$(MASON_DATA_PATH)/etc
@@ -364,7 +373,7 @@ dirs:
 
 install: testdeps config-install dirs files-install fixperms instruct
 
-files-install: libs-install etc-install config-install bin-install sbin-install html-install local-install doc-install
+files-install: libs-install etc-install config-install bin-install sbin-install html-install local-install doc-install font-install
 
 config-install:
 @COMMENT_INPLACE_LAYOUT@	$(INSTALL) -m 0755 -o $(BIN_OWNER) -g $(RTGROUP) -d $(DESTDIR)$(CONFIG_FILE_PATH)
@@ -423,6 +432,14 @@ html-install:
 @COMMENT_INPLACE_LAYOUT@	done
 # }}}
 
+# {{{ font-install
+font-install:
+@COMMENT_INPLACE_LAYOUT@	[ -d $(DESTDIR)$(RT_FONT_PATH) ] || $(INSTALL) -m 0755 -d $(DESTDIR)$(RT_FONT_PATH)
+@COMMENT_INPLACE_LAYOUT@	-( cd share/fonts && find . -type f -print ) | while read file ; do \
+@COMMENT_INPLACE_LAYOUT@	    $(INSTALL) -m 0644 "share/fonts/$$file" "$(DESTDIR)$(RT_FONT_PATH)/$$file" ; \
+@COMMENT_INPLACE_LAYOUT@	done
+# }}}
+
 # {{{ doc-install
 doc-install:
 @COMMENT_INPLACE_LAYOUT@	# RT 3.0.0 - RT 3.0.2 would accidentally create a file instead of a dir
@@ -512,7 +529,7 @@ apachectl:
 SNAPSHOT=$(shell git describe --tags)
 snapshot:
 	git archive --prefix "$(SNAPSHOT)/"  HEAD | tar -xf -
-	( cd $(SNAPSHOT) && autoconf && ./configure )
+	( cd $(SNAPSHOT) && autoconf && PERL=/usr/bin/perl ./configure )
 	tar -czf "$(SNAPSHOT).tar.gz" "$(SNAPSHOT)/"
 	rm -fr "$(SNAPSHOT)/"