--- generic-build-script.orig	2005-10-06 23:53:01.969838400 +0200
+++ generic-build-script	2005-10-10 15:48:10.994593600 +0200
@@ -71,6 +71,7 @@
 export src_pkg_name=${FULLPKG}-src.tar.bz2
 export src_patch_name=${FULLPKG}.patch
 export bin_pkg_name=${FULLPKG}.tar.bz2
+export log_pkg_name=${FULLPKG}-BUILDLOGS.tar.bz2
 
 export src_pkg=${topdir}/${src_pkg_name}
 export src_patch=${topdir}/${src_patch_name}
@@ -79,7 +80,11 @@
 export objdir=${srcdir}/.build
 export instdir=${srcdir}/.inst
 export srcinstdir=${srcdir}/.sinst
-export checkfile=${topdir}/${FULLPKG}.check
+export buildlogdir=${srcdir}/.buildlogs
+export configurelogfile=${srcinstdir}/${FULLPKG}-CONFIGURE.LOG
+export makelogfile=${srcinstdir}/${FULLPKG}-MAKE.LOG
+export checklogfile=${srcinstdir}/${FULLPKG}-CHECK.LOG
+export installlogfile=${srcinstdir}/${FULLPKG}-INSTALL.LOG
 
 prefix=/usr
 sysconfdir=/etc
@@ -174,19 +179,23 @@
 
 mkdirs() {
   (cd ${topdir} && \
-  rm -fr ${objdir} ${instdir} ${srcinstdir} && \
+  rm -fr ${objdir} ${instdir} ${srcinstdir} ${buildlogdir} && \
   mkdir -p ${objdir} && \
   mkdir -p ${instdir} && \
-  mkdir -p ${srcinstdir} )
+  mkdir -p ${srcinstdir} && \
+  mkdir -p ${buildlogdir} )
 }
 prep() {
   (cd ${topdir} && \
   unpack ${src_orig_pkg} && \
-  cd ${topdir} && \
   if [ -f ${src_patch} ] ; then \
     patch -Z -p0 < ${src_patch} ;\
   fi && \
-  mkdirs )
+  mkdirs && \
+  if [ -f ${topdir}/${log_pkg_name} ] ; then \
+    cd ${buildlogdir} && \
+    tar xvjf ${topdir}/${log_pkg_name}
+  fi )
 }
 conf() {
   (cd ${objdir} && \
@@ -197,7 +206,7 @@
   --libdir='${prefix}/lib' --includedir='${prefix}/include' \
   --mandir='${prefix}/share/man' --infodir='${prefix}/share/info' \
   --libexecdir='${sbindir}' --localstatedir="${localstatedir}" \
-  --datadir='${prefix}/share' )
+  --datadir='${prefix}/share' 2>&1 | tee ${configurelogfile} )
 }
 reconf() {
   (cd ${topdir} && \
@@ -207,11 +216,11 @@
 }
 build() {
   (cd ${objdir} && \
-  make CFLAGS="${MY_CFLAGS}" )
+  make CFLAGS="${MY_CFLAGS}" 2>&1 | tee ${makelogfile} )
 }
 check() {
   (cd ${objdir} && \
-  make ${test_rule} | tee ${checkfile} 2>&1 )
+  make ${test_rule} 2>&1 | tee ${checklogfile} )
 }
 clean() {
   (cd ${objdir} && \
@@ -220,7 +229,7 @@
 install() {
   (cd ${objdir} && \
   rm -fr ${instdir}/* && \
-  make install DESTDIR=${instdir} && \
+  make install DESTDIR=${instdir} 2>&1 | tee ${installlogfile} && \
   for f in ${prefix}/share/info/dir ${prefix}/info/dir ; do \
     if [ -f ${instdir}${f} ] ; then \
       rm -f ${instdir}${f} ; \
@@ -340,6 +349,7 @@
     cp $0.sig ${srcinstdir}/ ; \
   fi && \
   cd ${srcinstdir} && \
+  tar cvjf ${log_pkg_name} *.LOG && rm *.LOG && \
   tar cvjf ${src_pkg} * )
 }
 finish() {