[Rt-commit] r12874 - in rt/branches/3.8-TESTING: .

[sartak at bestpractical.com]

Author: sartak
Date: Wed Jun  4 13:11:12 2008
New Revision: 12874

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

Log:
 r61604 at onn:  sartak | 2008-06-04 13:10:58 -0400
 Revert svk mismerge


Modified: rt/branches/3.8-TESTING/Makefile.in
==============================================================================
--- rt/branches/3.8-TESTING/Makefile.in	(original)
+++ rt/branches/3.8-TESTING/Makefile.in	Wed Jun  4 13:11:12 2008
@@ -392,13 +392,13 @@
 # {{{ libs-install
 libs-install: 
 	[ -d $(DESTDIR)/$(RT_LIB_PATH) ] || mkdir -p $(DESTDIR)/$(RT_LIB_PATH)
-	-cp -rp lib/* $(DESTDIR)/$(RT_LIB_PATH)
+	-cd lib && find . -type d -name .svn -prune -o -type f -exec install -D {} $(DESTDIR)/$(RT_LIB_PATH)/{} \;
 # }}}
 
 # {{{ html-install
 html-install:
 	[ -d $(DESTDIR)/$(MASON_HTML_PATH) ] || mkdir -p $(DESTDIR)/$(MASON_HTML_PATH)
-	-cp -rp ./share/html/* $(DESTDIR)/$(MASON_HTML_PATH)
+	-cd share/html && find . -type d -name .svn -prune -o -type f -exec install -D {} $(DESTDIR)/$(MASON_HTML_PATH)/{} \;
 # }}}
 
 # {{{ doc-install
@@ -468,9 +468,9 @@
 
 # {{{ local-install
 local-install:
-	-cp -rp ./local/html/* $(DESTDIR)/$(MASON_LOCAL_HTML_PATH)
-	-cp -rp ./local/po/* $(DESTDIR)/$(LOCAL_LEXICON_PATH)
-	-cp -rp ./local/etc/* $(DESTDIR)/$(LOCAL_ETC_PATH)
+	-cd local/html && find . -type d -name .svn -prune -o -type f -exec install -D {} $(DESTDIR)/$(MASON_LOCAL_HTML_PATH)/{} \;
+	-cd local/po && find . -type d -name .svn -prune -o -type f -exec install -D {} $(DESTDIR)/$(LOCAL_LEXICON_PATH)/{} \;
+	-cd local/etc && find . -type d -name .svn -prune -o -type f -exec install -D {} $(DESTDIR)/$(LOCAL_ETC_PATH)/{} \;
 # }}}
 
 # {{{ Best Practical Build targets -- no user servicable parts inside

Modified: rt/branches/3.8-TESTING/sbin/rt-test-dependencies.in
==============================================================================
--- rt/branches/3.8-TESTING/sbin/rt-test-dependencies.in	(original)
+++ rt/branches/3.8-TESTING/sbin/rt-test-dependencies.in	Wed Jun  4 13:11:12 2008
@@ -448,8 +448,8 @@
         }
         unless ( $configured ) {
             print <<END;
-You didn't configure CPAN shell yet.
-Please run `@PERL@ -MCPAN -e shell` tool and configure it.
+You haven't configured the CPAN shell yet.
+Please run `@PERL@ -MCPAN -e shell` to configure it.
 END
             exit(1);
         }