[Rt-commit] r14267 - rt/3.8/trunk

[elacour at bestpractical.com]

Author: elacour
Date: Fri Jul 18 11:57:11 2008
New Revision: 14267

Modified:
   rt/3.8/trunk/   (props changed)
   rt/3.8/trunk/Makefile.in
   rt/3.8/trunk/configure.ac

Log:
 r10154 at datura:  manu | 2008-07-18 17:57:03 +0200
 - Don't expect an install bin/script with multifile support, rather uses "for
   file in" statement, this way, we don't need to depend on post 2.61 autoconf 
 - remove install-sh fullpath tweak, rather enclose "cd ... && find" by () so
   it's a subshell and we stay in the srcdir to run the ./install-sh command if
   needed


Modified: rt/3.8/trunk/Makefile.in
==============================================================================
--- rt/3.8/trunk/Makefile.in	(original)
+++ rt/3.8/trunk/Makefile.in	Fri Jul 18 11:57:11 2008
@@ -396,18 +396,22 @@
 # {{{ libs-install
 libs-install: 
 	[ -d $(DESTDIR)$(RT_LIB_PATH) ] || $(INSTALL) -m 0755 -d $(DESTDIR)$(RT_LIB_PATH)
-	-cd lib && find . -type d -name .svn -prune -o -type d -exec $(INSTALL) -m 0755 -d $(DESTDIR)$(RT_LIB_PATH)/{} \;
-	-cd lib && find . -type d -name .svn -prune -o -type f -print | while read file ; do \
-	     $(INSTALL) -m 0644 "$$file" "$(DESTDIR)$(RT_LIB_PATH)/$$file" ; \
+	-( 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
 # }}}
 
 # {{{ html-install
 html-install:
 	[ -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 -exec $(INSTALL) -m 0755 -d $(DESTDIR)$(MASON_HTML_PATH)/{} \;
-	-cd share/html && find . -type d -name .svn -prune -o -type f -print | while read file ; do \
-	    $(INSTALL) -m 0644 "$$file" "$(DESTDIR)$(MASON_HTML_PATH)/$$file" ; \
+	-( 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
 # }}}
 
@@ -423,14 +427,18 @@
 
 etc-install:
 	$(INSTALL) -m 0755 -d $(DESTDIR)$(RT_ETC_PATH)
-	cd etc && $(INSTALL) -m 0644 $(ETC_FILES) $(DESTDIR)$(RT_ETC_PATH)/
+	for file in $(ETC_FILES) ; do \
+	    $(INSTALL) -m 0644 "etc/$$file" "$(DESTDIR)$(RT_ETC_PATH)/" ; \
+	done
 # }}}
 
 # {{{ sbin-install
 
 sbin-install:
 	$(INSTALL) -m 0755 -d $(DESTDIR)$(RT_SBIN_PATH)
-	cd sbin && $(INSTALL) -o $(BIN_OWNER) -g $(RTGROUP) -m 0755 $(SYSTEM_BINARIES)  $(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
 
 # }}}
 
@@ -438,21 +446,29 @@
 
 bin-install:
 	$(INSTALL) -m 0755 -d $(DESTDIR)$(RT_BIN_PATH)
-	cd bin && $(INSTALL) -o $(BIN_OWNER) -g $(RTGROUP) -m 0755 $(BINARIES) $(DESTDIR)$(RT_BIN_PATH)/
+	for file in $(BINARIES) ; do \
+		$(INSTALL) -o $(BIN_OWNER) -g $(RTGROUP) -m 0755 "bin/$$file" "$(DESTDIR)$(RT_BIN_PATH)/" ; \
+	done
 
 # {{{ local-install
 local-install:
-	-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 -print | while read file ; do \
-	    $(INSTALL) -m 0644 "$$file" "$(DESTDIR)$(MASON_LOCAL_HTML_PATH)/$$file" ; \
-	done
-	-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 -print | while read file ; do \
-	    $(INSTALL) -m 0644 "$$file" "$(DESTDIR)$(LOCAL_LEXICON_PATH)/$$file" ; \
-	done
-	-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 -print | while read file ; do \
-	    $(INSTALL) -m 0644 "$$file" "$(DESTDIR)$(LOCAL_ETC_PATH)/$$file" ; \
+	-( cd local/html && find . -type d -name .svn -prune -o -type d -print ) | while read dir ; do \
+	    $(INSTALL) -m 0755 -d "$(DESTDIR)$(MASON_LOCAL_HTML_PATH)/$$dir" ; \
+	done
+	-( cd local/html && find . -type d -name .svn -prune -o -type f -print ) | while read file ; do \
+	    $(INSTALL) -m 0644 "local/html/$$file" "$(DESTDIR)$(MASON_LOCAL_HTML_PATH)/$$file" ; \
+	done
+	-( cd local/po && find . -type d -name .svn -prune -o -type d -print ) | while read dir ; do \
+	    $(INSTALL) -m 0755 -d "$(DESTDIR)$(LOCAL_LEXICON_PATH)/$$dir" ; \
+	done
+	-( cd local/po && find . -type d -name .svn -prune -o -type f -print ) | while read file ; do \
+	    $(INSTALL) -m 0644 "local/po/$$file" "$(DESTDIR)$(LOCAL_LEXICON_PATH)/$$file" ; \
+	done
+	-( cd local/etc && find . -type d -name .svn -prune -o -type d -print ) | while read dir ; do \
+	    $(INSTALL) -m 0755 -d "$(DESTDIR)$(LOCAL_ETC_PATH)/$$dir" ; \
+	done
+	-( cd local/etc && find . -type d -name .svn -prune -o -type f -print ) | while read file ; do \
+	    $(INSTALL) -m 0644 "etc/$$file" "$(DESTDIR)$(LOCAL_ETC_PATH)/$$file" ; \
 	done
 # }}}
 

Modified: rt/3.8/trunk/configure.ac
==============================================================================
--- rt/3.8/trunk/configure.ac	(original)
+++ rt/3.8/trunk/configure.ac	Fri Jul 18 11:57:11 2008
@@ -6,7 +6,7 @@
 AC_REVISION($Revision$)dnl
 
 dnl Setup autoconf
-AC_PREREQ([2.61a-341])
+AC_PREREQ([2.53])
 AC_INIT(RT, 3.7.86, [rt-bugs at bestpractical.com])
 AC_CONFIG_SRCDIR([lib/RT.pm.in])
 
@@ -23,13 +23,6 @@
 
 dnl Check for programs
 AC_PROG_INSTALL
-# If $INSTALL point to our install-sh, it may be a relative path. Make it a
-# full path so we can call it from anywhere
-AC_SUBST([rt_srcdir], ["`cd $srcdir && pwd`"])
-if test "$INSTALL" == "./install-sh -c"; then
-    INSTALL="$rt_srcdir/install-sh -c"
-fi
-
 AC_PROG_AWK
 AC_ARG_VAR([PERL],[Perl interpreter command])
 AC_PATH_PROG([PERL], [perl], [not found])