module-build-checkins

[Randy W. S. <si...@us...>]

Update of /cvsroot/module-build/Module-Build/t
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14534/t

Modified Files:
	destinations.t tilde.t 
Log Message:
Split "html" install path into "binhtml" and "libhtml" paths, using the recent (Perl 5.8.x) fields added to Config.pm. We still maintain support for the barely documented "html" install path.

Index: tilde.t
===================================================================
RCS file: /cvsroot/module-build/Module-Build/t/tilde.t,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- tilde.t	29 Jun 2005 07:50:41 -0000	1.10
+++ tilde.t	28 Jul 2005 07:29:22 -0000	1.11
@@ -5,7 +5,7 @@
 use lib 't/lib';
 use strict;
 
-use Test::More tests => 10;
+use Test::More tests => 11;
 
 
 use File::Spec ();
@@ -66,7 +66,9 @@
 					lib  => '~/lib'   }
                     );
     is( $mb->install_destination('lib'),  "$ENV{HOME}/lib" );
-    is( $mb->install_destination('html'), "$ENV{HOME}/html" );
+    # 'html' is translated to 'binhtml' & 'libhtml'
+    is( $mb->install_destination('binhtml'), "$ENV{HOME}/html" );
+    is( $mb->install_destination('libhtml'), "$ENV{HOME}/html" );
 
     $mb = run_sample( install_path => { lib => '~/lib' } );
     is( $mb->install_destination('lib'),  "$ENV{HOME}/lib" );

Index: destinations.t
===================================================================
RCS file: /cvsroot/module-build/Module-Build/t/destinations.t,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- destinations.t	28 Jul 2005 03:07:01 -0000	1.23
+++ destinations.t	28 Jul 2005 07:29:22 -0000	1.24
@@ -59,7 +59,10 @@
                    $Config{installscript},
         bindoc  => $Config{installsiteman1dir} || $Config{installman1dir},
         libdoc  => $Config{installsiteman3dir} || $Config{installman3dir},
-        html    => $Config{installsitehtmldir} || $Config{installhtmldir}
+        binhtml => $Config{installsitehtml1dir} ||
+		   $Config{installhtml1dir} || $Config{installhtmldir},
+        libhtml => $Config{installsitehtml3dir} ||
+		   $Config{installhtml3dir} || $Config{installhtmldir},
     });
 }
 
@@ -76,7 +79,8 @@
         script  => $Config{installscript} || $Config{installbin},
         bindoc  => $Config{installman1dir},
         libdoc  => $Config{installman3dir},
-        html    => $Config{installhtmldir},
+        binhtml => $Config{installhtml1dir} || $Config{installhtmldir},
+        libhtml => $Config{installhtml3dir} || $Config{installhtmldir},
     });
 
     $mb->installdirs('site');
@@ -100,7 +104,8 @@
         script  => catdir( $install_base, 'bin' ),
         bindoc  => catdir( $install_base, 'man', 'man1'),
         libdoc  => catdir( $install_base, 'man', 'man3' ),
-        html    => catdir( $install_base, 'html' ),
+        binhtml => catdir( $install_base, 'html', 'script'),
+        libhtml => catdir( $install_base, 'html', 'lib' ),
     });
 }
 
@@ -178,7 +183,8 @@
         script  => catdir( $install_base, 'bin' ),
         bindoc  => catdir( $install_base, 'man', 'man1'),
         libdoc  => catdir( $install_base, 'man', 'man3' ),
-        html    => catdir( $install_base, 'html'),
+        binhtml => catdir( $install_base, 'html', 'script'),
+        libhtml => catdir( $install_base, 'html', 'lib' ),
     });
 }
 
@@ -188,7 +194,7 @@
 
     local $Test::Builder::Level = $Test::Builder::Level + 1;
 
-    foreach my $type (qw(lib arch bin script bindoc libdoc html)) {
+    foreach my $type (qw(lib arch bin script bindoc libdoc binhtml libhtml)) {
         my $dest = $mb->install_destination( $type );
         like( $dest, "/^\Q$prefix\E/", "$type prefixed");