From 750842000004ee2d9170ace86f6a024cbf122d51 Mon Sep 17 00:00:00 2001
From: Amar Takhar <verm@aegisub.org>
Date: Sat, 5 Feb 2011 22:23:31 +0000
Subject: [PATCH] Commit a WIP for fixing tinderbox distfile building.

Originally committed to SVN as r5287.
---
 aegisub/packages/distfile/distfile.sh |  4 +++-
 aegisub/tinderbox/unix/dist.sh        | 14 +++++---------
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/aegisub/packages/distfile/distfile.sh b/aegisub/packages/distfile/distfile.sh
index 37fa5743f..4f74d1ebd 100755
--- a/aegisub/packages/distfile/distfile.sh
+++ b/aegisub/packages/distfile/distfile.sh
@@ -2,6 +2,8 @@
 SRCDIR=`pwd`
 TMPFILE=`mktemp /tmp/aegisub_dist.XXXXXX`
 EXTRA=`find . -name Makefile -or -name wscript`
+distdir?=aegisub-pkg
+
 rm -rf aegisub-pkg
 
 if ! test -d src; then
@@ -16,7 +18,7 @@ gmake distfiles \
 
 for i in ${EXTRA}; do
 	echo "aegisub-pkg/$i";
-	./install-sh -m 0644 $i aegisub-pkg/$i;
+	./install-sh -m 0644 $i ${distdir}/$i;
 done
 
 sh ${TMPFILE}
diff --git a/aegisub/tinderbox/unix/dist.sh b/aegisub/tinderbox/unix/dist.sh
index 3165484b4..092b4ac93 100755
--- a/aegisub/tinderbox/unix/dist.sh
+++ b/aegisub/tinderbox/unix/dist.sh
@@ -1,6 +1,11 @@
 #!/bin/sh
 DIST_NAME="aegisub-snap-r${1}"
 UNAME_S=`uname -s`
+CONFIGURE_ARGS="/mnt/devel/build/debug-wx-trunk-r66440//lib/wx/config/gtk2-unicode-2.9"
+BIN_MAKE="make"
+ACLOCAL_FLAGS="-I /home/verm/build/wx/share/aclocal" ./autogen.sh ${CONFIGURE_ARGS} || exit $?
+
+CONFIGURE_ARGS="/mnt/devel/build/debug-wx-trunk-r66440//lib/wx/config/gtk2-unicode-2.9"
 
 if test -z "${1}"; then
   echo "You must supply a revision number!"
@@ -10,16 +15,8 @@ fi
 # On FreeBSD "make" is PMake, so we need to use 'gmake'
 if test "${UNAME_S}" = "FreeBSD"; then
   BIN_MAKE="gmake"
-  CONFIGURE_ARGS="--with-wx-config=/usr/home/verm/build/wx/lib/wx/config/gtk2-unicode-debug-2.9"
-else
-  BIN_MAKE="make"
-  CONFIGURE_ARGS="--with-wx-config=/home/verm/build/wx/lib/wx/config/gtk2-unicode-debug-2.9"
 fi
 
-ACLOCAL_FLAGS="-I /home/verm/build/wx/share/aclocal" ./autogen.sh ${CONFIGURE_ARGS} || exit $?
-
-# XXX: Work around ancient versions of intltool (cough DEBIAN)
-touch intltool-update.in intltool-merge.in intltool-extract.in
 
 ${BIN_MAKE} distdir distdir="${DIST_NAME}" || exit $?
 
@@ -30,4 +27,3 @@ echo "${2}" > "${DIST_NAME}/slave_info"
 tar cf "${DIST_NAME}.tar" "${DIST_NAME}" || exit $?
 bzip2 -v ${DIST_NAME}.tar
 mv "${DIST_NAME}.tar.bz2" dist.tar.bz2
-