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

diff --git a/rt/Makefile.in b/rt/Makefile.in
index 19a5f6849..1f42102aa 100644
--- a/rt/Makefile.in
+++ b/rt/Makefile.in
@@ -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,6 +156,7 @@ BINARIES		=	$(RT_MODPERL_HANDLER) \
 				$(RT_STANDALONE_SERVER) \
 				$(RT_SPEEDYCGI_HANDLER) \
 				$(RT_FASTCGI_HANDLER) \
+				$(RT_FASTCGI_SERVER) \
 				$(RT_WIN32_FASTCGI_HANDLER)
 
 
@@ -165,6 +169,7 @@ SYSTEM_BINARIES		=	rt-dump-database \
 				rt-email-dashboards \
 				rt-email-group-admin \
 				rt-server \
+				rt-session-viewer \
 				rt-test-dependencies \
 				rt-clean-sessions \
 				rt-shredder \
@@ -284,7 +289,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 +317,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.
@@ -349,6 +354,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 +370,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 +429,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