[Rt-commit] r12918 - rt/branches/3.8-TESTING

[elacour at bestpractical.com]

Author: elacour
Date: Thu Jun  5 11:15:04 2008
New Revision: 12918

Modified:
   rt/branches/3.8-TESTING/   (props changed)
   rt/branches/3.8-TESTING/Makefile.in

Log:
 r9225 at datura:  manu | 2008-06-05 16:56:51 +0200
 * Add accidentally removed owner write access to RT_SiteConfig.pm
 * Add tests on local/* dirs before trying to install them
 * Removed a "-D" install option leaved in the last commit
 r9226 at datura:  manu | 2008-06-05 17:14:04 +0200
 Remove totally uneeded checks made in previous commit on local dir, 
 "-cd ...  &&" is enough!


Modified: rt/branches/3.8-TESTING/Makefile.in
==============================================================================
--- rt/branches/3.8-TESTING/Makefile.in	(original)
+++ rt/branches/3.8-TESTING/Makefile.in	Thu Jun  5 11:15:04 2008
@@ -298,7 +298,7 @@
 	chgrp -R $(RTGROUP) $(DESTDIR)/$(RT_ETC_PATH)
 
 	chmod 0440 $(DESTDIR)/$(CONFIG_FILE)
-	chmod 0440 $(DESTDIR)/$(SITE_CONFIG_FILE)
+	chmod 0640 $(DESTDIR)/$(SITE_CONFIG_FILE)
 
 	# Make the interfaces executable
 	chown $(BIN_OWNER) $(BINARIES)
@@ -351,7 +351,7 @@
 config-install:
 	$(INSTALL) -m 0755 -d $(DESTDIR)/$(CONFIG_FILE_PATH)	
 	-$(INSTALL) -m 0440 etc/RT_Config.pm $(DESTDIR)/$(CONFIG_FILE)
-	[ -f $(DESTDIR)/$(SITE_CONFIG_FILE) ] || $(INSTALL) -m 0440 etc/RT_SiteConfig.pm $(DESTDIR)/$(SITE_CONFIG_FILE) 
+	[ -f $(DESTDIR)/$(SITE_CONFIG_FILE) ] || $(INSTALL) -m 0640 etc/RT_SiteConfig.pm $(DESTDIR)/$(SITE_CONFIG_FILE) 
 
 	chgrp $(RTGROUP) $(DESTDIR)/$(CONFIG_FILE)
 	chown $(BIN_OWNER) $(DESTDIR)/$(CONFIG_FILE)
@@ -462,7 +462,7 @@
 	-cd local/html && find . -type d -name .svn -prune -o -type d -exec $(INSTALL) -m 0755 -d $(DESTDIR)/$(MASON_LOCAL_HTML_PATH)/{} \;
 	-cd local/html && find . -type d -name .svn -prune -o -type f -exec $(INSTALL) -m 0644 {} $(DESTDIR)/$(MASON_LOCAL_HTML_PATH)/{} \;
 	-cd local/po && find . -type d -name .svn -prune -o -type d -exec $(INSTALL) -m 0755 -d $(DESTDIR)/$(LOCAL_LEXICON_PATH)/{} \;
-	-cd local/po && find . -type d -name .svn -prune -o -type f -exec $(INSTALL) -m 0644 -D {} $(DESTDIR)/$(LOCAL_LEXICON_PATH)/{} \;
+	-cd local/po && find . -type d -name .svn -prune -o -type f -exec $(INSTALL) -m 0644 {} $(DESTDIR)/$(LOCAL_LEXICON_PATH)/{} \;
 	-cd local/etc && find . -type d -name .svn -prune -o -type d -exec $(INSTALL) -m 0755 -d $(DESTDIR)/$(LOCAL_ETC_PATH)/{} \;
 	-cd local/etc && find . -type d -name .svn -prune -o -type f -exec $(INSTALL) -m 0644 {} $(DESTDIR)/$(LOCAL_ETC_PATH)/{} \;
 # }}}