From: Phil Pennock <pdp@exim.org>
Date: Mon, 21 Feb 2011 08:06:10 +0000 (-0500)
Subject: Fix doc/ directory assembly in build-script.
X-Git-Tag: exim-4_75_RC2~3
X-Git-Url: https://git.exim.org/users/jgh/exim.git/commitdiff_plain/821bc55f156537c5d7ad99b648e14fc2e2e88be7

Fix doc/ directory assembly in build-script.
---

diff --git a/release-process/scripts/mk_exim_release.pl b/release-process/scripts/mk_exim_release.pl
index f9dbe21a3..566f2619d 100755
--- a/release-process/scripts/mk_exim_release.pl
+++ b/release-process/scripts/mk_exim_release.pl
@@ -223,7 +223,8 @@ sub build_documentation {
 sub move_text_docs_into_pkg {
     my $context = shift;
 
-    my $old_docdir = File::Spec->catdir( $context->{eximpkgdir}, 'doc', 'doc-docbook' );
+    my $old_docdir = File::Spec->catdir( $context->{release_tree}, 'doc', 'doc-docbook' );
+    my $old_txtdir = File::Spec->catdir( $context->{release_tree}, 'doc', 'doc-txt' );
     my $new_docdir = File::Spec->catdir( $context->{eximpkgdir}, 'doc' );
     mkpath( $new_docdir, { verbose => ( $verbose || $debug ) } );
 
@@ -233,7 +234,7 @@ sub move_text_docs_into_pkg {
     }
 
     # move text documents across
-    foreach my $file ( glob( File::Spec->catfile( 'doc/doc-txt', '*' ) ) ) {
+    foreach my $file ( glob( File::Spec->catfile( $old_txtdir, '*' ) ) ) {
 
         # skip a few we dont want
         my $fn = ( File::Spec->splitpath($file) )[2];