From 0788392f9ec947a1a649a1cc7d90a70b3e4aa724 Mon Sep 17 00:00:00 2001
From: Michael Pyne <mpyne@kde.org>
Date: Mon, 2 Aug 2004 07:47:53 +0000
Subject: [PATCH] Fix qt-use-builddir-hack (didn't work after using it the
 first time) Add kdecvs-pywizard to package.

svn path=/trunk/kdenonbeta/kdecvs-build/; revision=335046
---
 HISTORY         | 3 +++
 doc.html.in     | 9 ++++++++-
 kdecvs-build    | 4 ++--
 make-package.sh | 2 +-
 4 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/HISTORY b/HISTORY
index ac06542..8800b5e 100644
--- a/HISTORY
+++ b/HISTORY
@@ -1,3 +1,6 @@
+Version history: 0.81
+ * Fix use-qt-builddir-hack to work on the second and subsequent runs.
+
 Version history: 0.80
  * Fixed an output quibble discovered by Michal Rokos
  * Added set-env config option.
diff --git a/doc.html.in b/doc.html.in
index 0f56408..8167742 100644
--- a/doc.html.in
+++ b/doc.html.in
@@ -65,6 +65,13 @@ those who either can't or don't feel like installing it.</p>
 <p id="emailaddy">It is authored by Michael Pyne (mpyne (AT) grammarian (DOT) homelinux 
 (DOT) net), and is one of several build scripts for this purpose.</p>
 
+<p><b>2004-Aug-02:</b> v0.81<br/>
+Bugfixes:
+<ul>
+<li>Fixed <a href="#conf-use-qt-builddir-hack">use-qt-builddir-hack</a> to
+work on the second and subsequent runs of kdecvs-build.</li>
+</ul>
+
 <p><b>2004-Jul-25:</b> v0.80<br/>
 New features:
 <ul>
@@ -822,7 +829,7 @@ href="#options">.kdecvs-buildrc options</a>.
 <div align="center" class="thankyou">
 <font size="-1"><a href="http://www.cvsup.org/">CVSup</a> is a registered trademark of John D. Polstra.
 <br/>
-Last modified: Sun Jul 25 19:10:36 2004</font>
+Last modified: Mon Aug  2 03:45:43 2004</font>
 </div>
 </body>
 </html>
diff --git a/kdecvs-build b/kdecvs-build
index 2fbdc0c..4062ef0 100755
--- a/kdecvs-build
+++ b/kdecvs-build
@@ -1698,8 +1698,8 @@ sub setup_build_system
 
     if ($module eq 'qt-copy' && get_option($module, 'use-qt-builddir-hack'))
     {
-        if (log_command ('qt-copy', 'create-builddir', ['cp', '-a', 
-                         "$kdecvs/$module", "$builddir/qt-copy" ]))
+        if (log_command ('qt-copy', 'create-builddir', ['cp', '-af',
+                         "$kdecvs/$module", "$builddir" ]))
         {
             print "Error creating qt-copy build system!\n";
             return 0;
diff --git a/make-package.sh b/make-package.sh
index fbc07ea..11e0038 100755
--- a/make-package.sh
+++ b/make-package.sh
@@ -12,7 +12,7 @@ VERSION_SUBST="s/\\\$VERSION/$VERSION/g"
 # Other fun variables
 WEB_PAGE_DIR="/var/www/localhost/htdocs/kdecvs-build"
 FILE_LIST="HISTORY TODO AUTHORS COPYING doc.html \
-           kdecvs-build kdecvs-buildrc-sample option-list"
+           kdecvs-build kdecvs-buildrc-sample option-list kdecvs-pywizard"
 FILE_NAME="kdecvs-build-$VERSION.tar.gz"
 
 if [ $EUID -ne 0 ]; then