[Rt-commit] r14864 - rt/3.8/branches/3.8.1-releng

falcone at bestpractical.com falcone at bestpractical.com
Wed Aug 6 14:12:39 EDT 2008


Author: falcone
Date: Wed Aug  6 14:12:34 2008
New Revision: 14864

Modified:
   rt/3.8/branches/3.8.1-releng/   (props changed)
   rt/3.8/branches/3.8.1-releng/Makefile.in
   rt/3.8/branches/3.8.1-releng/aclocal.m4

Log:
- Merge //mirror/bps-public/rt/3.8/trunk to //mirror/bps-public/rt/3.8/branches/3.8.1-releng

Modified: rt/3.8/branches/3.8.1-releng/Makefile.in
==============================================================================
--- rt/3.8/branches/3.8.1-releng/Makefile.in	(original)
+++ rt/3.8/branches/3.8.1-releng/Makefile.in	Wed Aug  6 14:12:34 2008
@@ -366,12 +366,10 @@
 files-install: libs-install etc-install config-install bin-install sbin-install html-install local-install doc-install
 
 config-install:
-ifneq "$(RT_LAYOUT)" "inplace"
-	$(INSTALL) -m 0755 -o $(BIN_OWNER) -g $(RTGROUP) -d $(DESTDIR)$(CONFIG_FILE_PATH)	
-	-$(INSTALL) -m 0440 -o $(BIN_OWNER) -g $(RTGROUP)  etc/RT_Config.pm $(DESTDIR)$(CONFIG_FILE)
-	[ -f $(DESTDIR)$(SITE_CONFIG_FILE) ] || $(INSTALL) -m 0640 -o $(BIN_OWNER) -g $(RTGROUP) etc/RT_SiteConfig.pm $(DESTDIR)$(SITE_CONFIG_FILE) 
-	@echo "Installed configuration. About to install RT in  $(RT_PATH)"
-endif
+ at COMMENT_INPLACE_LAYOUT@	$(INSTALL) -m 0755 -o $(BIN_OWNER) -g $(RTGROUP) -d $(DESTDIR)$(CONFIG_FILE_PATH)	
+ at COMMENT_INPLACE_LAYOUT@	-$(INSTALL) -m 0440 -o $(BIN_OWNER) -g $(RTGROUP)  etc/RT_Config.pm $(DESTDIR)$(CONFIG_FILE)
+ at COMMENT_INPLACE_LAYOUT@	[ -f $(DESTDIR)$(SITE_CONFIG_FILE) ] || $(INSTALL) -m 0640 -o $(BIN_OWNER) -g $(RTGROUP) etc/RT_SiteConfig.pm $(DESTDIR)$(SITE_CONFIG_FILE) 
+ at COMMENT_INPLACE_LAYOUT@	@echo "Installed configuration. About to install RT in  $(RT_PATH)"
 
 test: 
 	$(PERL) "-MExtUtils::Command::MM" -e "test_harness($(TEST_VERBOSE), 'lib')" $(TEST_FILES)
@@ -399,72 +397,60 @@
 
 # {{{ libs-install
 libs-install: 
-ifneq "$(RT_LAYOUT)" "inplace"
-	[ -d $(DESTDIR)$(RT_LIB_PATH) ] || $(INSTALL) -m 0755 -d $(DESTDIR)$(RT_LIB_PATH)
-	-( cd lib && find . -type d -name .svn -prune -o -type d -print ) | while read dir ; do \
-	    $(INSTALL) -m 0755 -d "$(DESTDIR)$(RT_LIB_PATH)/$$dir" ; \
-	done
-	-( cd lib && find . -type d -name .svn -prune -o -type f -print ) | while read file ; do \
-	     $(INSTALL) -m 0644 "lib/$$file" "$(DESTDIR)$(RT_LIB_PATH)/$$file" ; \
-	done
-endif
+ at COMMENT_INPLACE_LAYOUT@	[ -d $(DESTDIR)$(RT_LIB_PATH) ] || $(INSTALL) -m 0755 -d $(DESTDIR)$(RT_LIB_PATH)
+ at COMMENT_INPLACE_LAYOUT@	-( cd lib && find . -type d -name .svn -prune -o -type d -print ) | while read dir ; do \
+ at COMMENT_INPLACE_LAYOUT@	    $(INSTALL) -m 0755 -d "$(DESTDIR)$(RT_LIB_PATH)/$$dir" ; \
+ at COMMENT_INPLACE_LAYOUT@	done
+ at COMMENT_INPLACE_LAYOUT@	-( cd lib && find . -type d -name .svn -prune -o -type f -print ) | while read file ; do \
+ at COMMENT_INPLACE_LAYOUT@	     $(INSTALL) -m 0644 "lib/$$file" "$(DESTDIR)$(RT_LIB_PATH)/$$file" ; \
+ at COMMENT_INPLACE_LAYOUT@	done
 # }}}
 
 # {{{ html-install
 html-install:
-ifneq "$(RT_LAYOUT)" "inplace"
-	[ -d $(DESTDIR)$(MASON_HTML_PATH) ] || $(INSTALL) -m 0755 -d $(DESTDIR)$(MASON_HTML_PATH)
-	-( cd share/html && find . -type d -name .svn -prune -o -type d -print ) | while read dir ; do \
-	    $(INSTALL) -m 0755 -d "$(DESTDIR)$(MASON_HTML_PATH)/$$dir" ; \
-	done
-	-( cd share/html && find . -type d -name .svn -prune -o -type f -print ) | while read file ; do \
-	    $(INSTALL) -m 0644 "share/html/$$file" "$(DESTDIR)$(MASON_HTML_PATH)/$$file" ; \
-	done
-endif
+ at COMMENT_INPLACE_LAYOUT@	[ -d $(DESTDIR)$(MASON_HTML_PATH) ] || $(INSTALL) -m 0755 -d $(DESTDIR)$(MASON_HTML_PATH)
+ at COMMENT_INPLACE_LAYOUT@	-( cd share/html && find . -type d -name .svn -prune -o -type d -print ) | while read dir ; do \
+ at COMMENT_INPLACE_LAYOUT@	    $(INSTALL) -m 0755 -d "$(DESTDIR)$(MASON_HTML_PATH)/$$dir" ; \
+ at COMMENT_INPLACE_LAYOUT@	done
+ at COMMENT_INPLACE_LAYOUT@	-( cd share/html && find . -type d -name .svn -prune -o -type f -print ) | while read file ; do \
+ at COMMENT_INPLACE_LAYOUT@	    $(INSTALL) -m 0644 "share/html/$$file" "$(DESTDIR)$(MASON_HTML_PATH)/$$file" ; \
+ at COMMENT_INPLACE_LAYOUT@	done
 # }}}
 
 # {{{ doc-install
 doc-install:
-ifneq "$(RT_LAYOUT)" "inplace"
-	# RT 3.0.0 - RT 3.0.2 would accidentally create a file instead of a dir
-	-[ -f $(DESTDIR)$(RT_DOC_PATH) ] && rm $(DESTDIR)$(RT_DOC_PATH) 
-	[ -d $(DESTDIR)$(RT_DOC_PATH) ] || $(INSTALL) -m 0755 -d $(DESTDIR)$(RT_DOC_PATH)
-	-$(INSTALL) -m 0644 ./README $(DESTDIR)$(RT_DOC_PATH)/
-endif
+ at COMMENT_INPLACE_LAYOUT@	# RT 3.0.0 - RT 3.0.2 would accidentally create a file instead of a dir
+ at COMMENT_INPLACE_LAYOUT@	-[ -f $(DESTDIR)$(RT_DOC_PATH) ] && rm $(DESTDIR)$(RT_DOC_PATH) 
+ at COMMENT_INPLACE_LAYOUT@	[ -d $(DESTDIR)$(RT_DOC_PATH) ] || $(INSTALL) -m 0755 -d $(DESTDIR)$(RT_DOC_PATH)
+ at COMMENT_INPLACE_LAYOUT@	-$(INSTALL) -m 0644 ./README $(DESTDIR)$(RT_DOC_PATH)/
 # }}}
 
 # {{{ etc-install
 
 etc-install:
-ifneq "$(RT_LAYOUT)" "inplace"
-	[ -d $(DESTDIR)$(RT_ETC_PATH) ] || $(INSTALL) -m 0755 -d $(DESTDIR)$(RT_ETC_PATH)
-	for file in $(ETC_FILES) ; do \
-	    $(INSTALL) -m 0644 "etc/$$file" "$(DESTDIR)$(RT_ETC_PATH)/" ; \
-	done
-endif
+ at COMMENT_INPLACE_LAYOUT@	[ -d $(DESTDIR)$(RT_ETC_PATH) ] || $(INSTALL) -m 0755 -d $(DESTDIR)$(RT_ETC_PATH)
+ at COMMENT_INPLACE_LAYOUT@	for file in $(ETC_FILES) ; do \
+ at COMMENT_INPLACE_LAYOUT@	    $(INSTALL) -m 0644 "etc/$$file" "$(DESTDIR)$(RT_ETC_PATH)/" ; \
+ at COMMENT_INPLACE_LAYOUT@	done
 # }}}
 
 # {{{ sbin-install
 
 sbin-install:
-ifneq "$(RT_LAYOUT)" "inplace"
-	$(INSTALL) -m 0755 -d $(DESTDIR)$(RT_SBIN_PATH)
-	for file in $(SYSTEM_BINARIES) ; do \
-		$(INSTALL) -o $(BIN_OWNER) -g $(RTGROUP) -m 0755 "sbin/$$file" "$(DESTDIR)$(RT_SBIN_PATH)/" ; \
-	done
-endif
+ at COMMENT_INPLACE_LAYOUT@	$(INSTALL) -m 0755 -d $(DESTDIR)$(RT_SBIN_PATH)
+ at COMMENT_INPLACE_LAYOUT@	for file in $(SYSTEM_BINARIES) ; do \
+ at COMMENT_INPLACE_LAYOUT@		$(INSTALL) -o $(BIN_OWNER) -g $(RTGROUP) -m 0755 "sbin/$$file" "$(DESTDIR)$(RT_SBIN_PATH)/" ; \
+ at COMMENT_INPLACE_LAYOUT@	done
 
 # }}}
 
 # {{{ bin-install
 
 bin-install:
-ifneq "$(RT_LAYOUT)" "inplace"
-	$(INSTALL) -m 0755 -d $(DESTDIR)$(RT_BIN_PATH)
-	for file in $(BINARIES) ; do \
-		$(INSTALL) -o $(BIN_OWNER) -g $(RTGROUP) -m 0755 "bin/$$file" "$(DESTDIR)$(RT_BIN_PATH)/" ; \
-	done
-endif
+ at COMMENT_INPLACE_LAYOUT@	$(INSTALL) -m 0755 -d $(DESTDIR)$(RT_BIN_PATH)
+ at COMMENT_INPLACE_LAYOUT@	for file in $(BINARIES) ; do \
+ at COMMENT_INPLACE_LAYOUT@		$(INSTALL) -o $(BIN_OWNER) -g $(RTGROUP) -m 0755 "bin/$$file" "$(DESTDIR)$(RT_BIN_PATH)/" ; \
+ at COMMENT_INPLACE_LAYOUT@	done
 
 # {{{ local-install
 local-install:

Modified: rt/3.8/branches/3.8.1-releng/aclocal.m4
==============================================================================
--- rt/3.8/branches/3.8.1-releng/aclocal.m4	(original)
+++ rt/3.8/branches/3.8.1-releng/aclocal.m4	Wed Aug  6 14:12:34 2008
@@ -45,6 +45,11 @@
 	AC_SUBST(rt_layout_name)
 	AC_MSG_RESULT($rt_layout_name)
 fi
+if test "x$rt_layout_name" != "xinplace" ; then
+	AC_SUBST([COMMENT_INPLACE_LAYOUT], [""])
+else
+	AC_SUBST([COMMENT_INPLACE_LAYOUT], [# ])
+fi
 ])
 
 dnl


More information about the Rt-commit mailing list