pygtk/pygtk-2.10.4-buildroot_fix.patch

diff -Nru pygtk-2.10.4.orig/codegen/Makefile.in pygtk-2.10.4/codegen/Makefile.in
--- pygtk-2.10.4.orig/codegen/Makefile.in	2007-02-05 21:55:35.000000000 +0100
+++ pygtk-2.10.4/codegen/Makefile.in	2007-03-16 19:02:29.000000000 +0100
@@ -306,7 +306,7 @@
 	  else :; fi; \
 	done; \
 	test -z "$$dlist" || \
-	PYTHON=$(PYTHON) $(py_compile) --basedir "$(DESTDIR)$(codegendir)" $$dlist
+	PYTHON=$(PYTHON) $(py_compile) --basedir "$(codegendir)" --destdir $(DESTDIR) $$dlist
 
 uninstall-codegenPYTHON:
 	@$(NORMAL_UNINSTALL)
diff -Nru pygtk-2.10.4.orig/examples/Makefile.in pygtk-2.10.4/examples/Makefile.in
--- pygtk-2.10.4.orig/examples/Makefile.in	2007-02-05 21:55:35.000000000 +0100
+++ pygtk-2.10.4/examples/Makefile.in	2007-03-16 19:02:29.000000000 +0100
@@ -380,7 +380,7 @@
 	  else :; fi; \
 	done; \
 	test -z "$$dlist" || \
-	PYTHON=$(PYTHON) $(py_compile) --basedir "$(DESTDIR)$(demodir)" $$dlist
+	PYTHON=$(PYTHON) $(py_compile) --basedir "$(demodir)" --destdir $(DESTDIR) $$dlist
 
 uninstall-demoPYTHON:
 	@$(NORMAL_UNINSTALL)
@@ -403,7 +403,7 @@
 	  else :; fi; \
 	done; \
 	test -z "$$dlist" || \
-	PYTHON=$(PYTHON) $(py_compile) --basedir "$(DESTDIR)$(pygtklibdir)" $$dlist
+	PYTHON=$(PYTHON) $(py_compile) --basedir "$(pygtklibdir)" --destdir $(DESTDIR) $$dlist
 
 uninstall-pygtklibPYTHON:
 	@$(NORMAL_UNINSTALL)
diff -Nru pygtk-2.10.4.orig/gtk/Makefile.in pygtk-2.10.4/gtk/Makefile.in
--- pygtk-2.10.4.orig/gtk/Makefile.in	2007-02-05 21:55:36.000000000 +0100
+++ pygtk-2.10.4/gtk/Makefile.in	2007-03-16 19:02:29.000000000 +0100
@@ -811,7 +811,7 @@
 	  else :; fi; \
 	done; \
 	test -z "$$dlist" || \
-	PYTHON=$(PYTHON) $(py_compile) --basedir "$(DESTDIR)$(pygtkdir)" $$dlist
+	PYTHON=$(PYTHON) $(py_compile) --basedir "$(pygtkdir)" --destdir $(DESTDIR) $$dlist
 
 uninstall-pygtkPYTHON:
 	@$(NORMAL_UNINSTALL)
diff -Nru pygtk-2.10.4.orig/py-compile pygtk-2.10.4/py-compile
--- pygtk-2.10.4.orig/py-compile	2007-02-05 21:55:36.000000000 +0100
+++ pygtk-2.10.4/py-compile	2007-03-16 19:02:42.000000000 +0100
@@ -1,9 +1,9 @@
 #!/bin/sh
 # py-compile - Compile a Python program
 
-scriptversion=2004-01-12.23
+scriptversion=2005-05-14.22
 
-# Copyright (C) 2000, 2001, 2003, 2004  Free Software Foundation, Inc.
+# Copyright (C) 2000, 2001, 2003, 2004, 2005  Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -17,8 +17,8 @@
 
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301, USA.
 
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -34,34 +34,54 @@
 fi
 
 basedir=
+destdir=
+files=
+while test $# -ne 0; do
+  case "$1" in
+    --basedir)
+      basedir=$2
+      if test -z "$basedir"; then
+        echo "$0: Missing argument to --basedir." 1>&2
+        exit 1
+      fi
+      shift
+      ;;
+    --destdir)
+      destdir=$2
+      if test -z "$destdir"; then
+        echo "$0: Missing argument to --destdir." 1>&2
+        exit 1
+      fi
+      shift
+      ;;
+    -h|--h*)
+      cat <<\EOF
+Usage: py-compile [--help] [--version] [--basedir DIR] [--destdir DIR] FILES..."
+
+Byte compile some python scripts FILES.  Use --destdir to specify any
+leading directory path to the FILES that you don't want to include in the
+byte compiled file.  Specify --basedir for any additional path information you
+do want to be shown in the byte compiled file.
 
-case "$1" in
-  --basedir)
-    basedir=$2
-    if test -z "$basedir"; then
-      echo "$0: Missing argument to --basedir." 1>&2
-      exit 1
-    fi
-    shift 2
-    ;;
-  -h|--h*)
-    cat <<\EOF
-Usage: py-compile [--help] [--version] [--basedir DIR] FILES..."
-
-Byte compile some python scripts FILES.  This should be performed
-after they have been moved to the final installation location
+Example:
+  py-compile --destdir /tmp/pkg-root --basedir /usr/share/test test.py test2.py
 
 Report bugs to <bug-automake@gnu.org>.
 EOF
-    exit 0
-    ;;
-  -v|--v*)
-    echo "py-compile $scriptversion"
-    exit 0
-    ;;
-esac
+      exit $?
+      ;;
+    -v|--v*)
+      echo "py-compile $scriptversion"
+      exit $?
+      ;;
+    *)
+      files="$files $1"
+      ;;
+  esac
+  shift
+done
 
-if [ $# = 0 ]; then
+if test -z "$files"; then
     echo "$0: No files given.  Try \`$0 --help' for more information." 1>&2
     exit 1
 fi
@@ -69,38 +89,51 @@
 # if basedir was given, then it should be prepended to filenames before
 # byte compilation.
 if [ -z "$basedir" ]; then
-    trans="path = file"
+    pathtrans="path = file"
 else
-    trans="path = os.path.join('$basedir', file)"
+    pathtrans="path = os.path.join('$basedir', file)"
+fi
+
+# if destdir was given, then it needs to be prepended to the filename to
+# byte compile but not go into the compiled file.
+if [ -z "$destdir" ]; then
+    filetrans="filepath = path"
+else
+    filetrans="filepath = os.path.normpath('$destdir' + os.sep + path)"
 fi
 
 $PYTHON -c "
 import sys, os, string, py_compile
 
-files = '''$*'''
+files = '''$files'''
+
 print 'Byte-compiling python modules...'
 for file in string.split(files):
-    $trans
-    if not os.path.exists(path) or not (len(path) >= 3 and path[-3:] == '.py'):
+    $pathtrans
+    $filetrans
+    if not os.path.exists(filepath) or not (len(filepath) >= 3
+                                            and filepath[-3:] == '.py'):
 	continue
     print file,
     sys.stdout.flush()
-    py_compile.compile(path)
+    py_compile.compile(filepath, filepath + 'c', path)
 print" || exit $?
 
 # this will fail for python < 1.5, but that doesn't matter ...
 $PYTHON -O -c "
 import sys, os, string, py_compile
 
-files = '''$*'''
+files = '''$files'''
 print 'Byte-compiling python modules (optimized versions) ...'
 for file in string.split(files):
-    $trans
-    if not os.path.exists(path) or not (len(path) >= 3 and path[-3:] == '.py'):
+    $pathtrans
+    $filetrans
+    if not os.path.exists(filepath) or not (len(filepath) >= 3
+                                            and filepath[-3:] == '.py'):
 	continue
     print file,
     sys.stdout.flush()
-    py_compile.compile(path)
+    py_compile.compile(filepath, filepath + 'o', path)
 print" 2>/dev/null || :
 
 # Local Variables: