[freeside-commits] freeside/rt Makefile, 1.10, 1.11 Makefile.in, 1.2, 1.3 config.status, 1.5, 1.6
Ivan,,,
ivan at wavetail.420.am
Tue May 18 12:20:30 PDT 2010
Update of /home/cvs/cvsroot/freeside/rt
In directory wavetail.420.am:/tmp/cvs-serv2904
Modified Files:
Makefile Makefile.in config.status
Log Message:
merging rt \3.8.8 to HEAD
Index: Makefile.in
===================================================================
RCS file: /home/cvs/cvsroot/freeside/rt/Makefile.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -d -r1.2 -r1.3
--- Makefile.in 31 Dec 2009 14:31:51 -0000 1.2
+++ Makefile.in 18 May 2010 19:20:28 -0000 1.3
@@ -106,6 +106,7 @@
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_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 @@
$(RT_STANDALONE_SERVER) \
$(RT_SPEEDYCGI_HANDLER) \
$(RT_FASTCGI_HANDLER) \
+ $(RT_FASTCGI_SERVER) \
$(RT_WIN32_FASTCGI_HANDLER)
@@ -284,7 +288,7 @@
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
@@ -349,6 +353,7 @@
# {{{ 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 +369,7 @@
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 +428,14 @@
@COMMENT_INPLACE_LAYOUT@ done
# }}}
+# {{{ font-install
+font-install:
+ at COMMENT_INPLACE_LAYOUT@ [ -d $(DESTDIR)$(RT_FONT_PATH) ] || $(INSTALL) -m 0755 -d $(DESTDIR)$(RT_FONT_PATH)
+ at COMMENT_INPLACE_LAYOUT@ -( cd share/fonts && find . -type f -print ) | while read file ; do \
+ at COMMENT_INPLACE_LAYOUT@ $(INSTALL) -m 0644 "share/fonts/$$file" "$(DESTDIR)$(RT_FONT_PATH)/$$file" ; \
+ at 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
Index: config.status
===================================================================
RCS file: /home/cvs/cvsroot/freeside/rt/config.status,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -w -d -r1.5 -r1.6
--- config.status 31 Dec 2009 14:08:10 -0000 1.5
+++ config.status 18 May 2010 19:20:28 -0000 1.6
@@ -7,107 +7,89 @@
debug=false
ac_cs_recheck=false
ac_cs_silent=false
+
SHELL=${CONFIG_SHELL-/bin/sh}
-## --------------------- ##
+export SHELL
+## -------------------- ##
## M4sh Initialization. ##
-## --------------------- ##
+## -------------------- ##
[...1356 lines suppressed...]
- bin/standalone_httpd ) chmod ug+x $ac_file
+ "bin/standalone_httpd":F) chmod ug+x $ac_file
;;
- bin/rt-crontool ) chmod ug+x $ac_file
+ "bin/rt-crontool":F) chmod ug+x $ac_file
;;
- bin/rt-mailgate ) chmod ug+x $ac_file
+ "bin/rt-mailgate":F) chmod ug+x $ac_file
;;
- bin/rt ) chmod ug+x $ac_file
+ "bin/rt":F) chmod ug+x $ac_file
;;
+
esac
-done
+done # for ac_tag
-{ (exit 0); exit 0; }
+
+as_fn_exit 0
Index: Makefile
===================================================================
RCS file: /home/cvs/cvsroot/freeside/rt/Makefile,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -w -d -r1.10 -r1.11
--- Makefile 31 Dec 2009 14:31:51 -0000 1.10
+++ Makefile 18 May 2010 19:20:28 -0000 1.11
@@ -63,7 +63,7 @@
RT_VERSION_MAJOR = 3
RT_VERSION_MINOR = 8
-RT_VERSION_PATCH = 7
+RT_VERSION_PATCH = 8
RT_VERSION = $(RT_VERSION_MAJOR).$(RT_VERSION_MINOR).$(RT_VERSION_PATCH)
TAG = rt-$(RT_VERSION_MAJOR)-$(RT_VERSION_MINOR)-$(RT_VERSION_PATCH)
@@ -106,6 +106,7 @@
RT_MAN_PATH = /opt/rt3/man
RT_VAR_PATH = /opt/rt3/var
RT_DOC_PATH = /opt/rt3/share/doc
+RT_FONT_PATH = /opt/rt3/share/fonts
RT_LOCAL_PATH = /opt/rt3/local
LOCAL_PLUGIN_PATH = /opt/rt3/local/plugins
LOCAL_ETC_PATH = /opt/rt3/local/etc
@@ -134,6 +135,8 @@
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 @@
$(RT_STANDALONE_SERVER) \
$(RT_SPEEDYCGI_HANDLER) \
$(RT_FASTCGI_HANDLER) \
+ $(RT_FASTCGI_SERVER) \
$(RT_WIN32_FASTCGI_HANDLER)
@@ -284,7 +288,7 @@
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
@@ -349,6 +353,7 @@
# {{{ 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 +369,7 @@
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:
$(INSTALL) -m 0755 -o $(BIN_OWNER) -g $(RTGROUP) -d $(DESTDIR)$(CONFIG_FILE_PATH)
@@ -423,6 +428,14 @@
done
# }}}
+# {{{ font-install
+font-install:
+ [ -d $(DESTDIR)$(RT_FONT_PATH) ] || $(INSTALL) -m 0755 -d $(DESTDIR)$(RT_FONT_PATH)
+ -( cd share/fonts && find . -type f -print ) | while read file ; do \
+ $(INSTALL) -m 0644 "share/fonts/$$file" "$(DESTDIR)$(RT_FONT_PATH)/$$file" ; \
+ done
+# }}}
+
# {{{ doc-install
doc-install:
# RT 3.0.0 - RT 3.0.2 would accidentally create a file instead of a dir
More information about the freeside-commits
mailing list