Insert libgcj's Python module directory at the start of the search

path, rather than at the end.

From-SVN: r170138

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index f74b61aba0b0b380ae836997db570d40dcd537f0..733c786ea8ead0f2f3c549f903aa4a6c5e64413f 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,9 @@
+2011-02-14  Gary Benson  <gbenson@redhat.com>
+
+       * libjava/contrib/aot-compile.in: Add our module directory
+       to the start of the search path rather than the end.
+       * libjava/contrib/aot-compile-rpm.in: Likewise.
+
 2011-02-14  Gary Benson  <gbenson@redhat.com>
 
        PR libjava/47484

diff --git a/libjava/contrib/aot-compile-rpm.in b/libjava/contrib/aot-compile-rpm.in
index c3bdb165096b1b6623e842e3c858332e1339ee28..7d95632555d4ce76df061dbd0494cb3305514df2 100644 (file)
--- a/libjava/contrib/aot-compile-rpm.in
+++ b/libjava/contrib/aot-compile-rpm.in
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-## Copyright (C) 2005, 2006, 2007 Free Software Foundation
+## Copyright (C) 2005, 2006, 2007, 2011 Free Software Foundation
 ## Written by Gary Benson <gbenson@redhat.com>
 ##
 ## This program is free software; you can redistribute it and/or modify
@@ -14,7 +14,7 @@
 ## GNU General Public License for more details.
 
 import sys
-sys.path.append("@python_mod_dir_expanded@")
+sys.path.insert(0, "@python_mod_dir_expanded@")
 import aotcompile
 import os
 

diff --git a/libjava/contrib/aot-compile.in b/libjava/contrib/aot-compile.in
index b891f20b85fcfcf4efabfc632972bc242921e931..91cfc67d99c7992a4069df3e38877614cf7e5dd2 100644 (file)
--- a/libjava/contrib/aot-compile.in
+++ b/libjava/contrib/aot-compile.in
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-## Copyright (C) 2006 Free Software Foundation
+## Copyright (C) 2006, 2011 Free Software Foundation
 ## Written by Gary Benson <gbenson@redhat.com>
 ##
 ## This program is free software; you can redistribute it and/or modify
@@ -14,7 +14,7 @@
 ## GNU General Public License for more details.
 
 import sys
-sys.path.append("@python_mod_dir_expanded@")
+sys.path.insert(0, "@python_mod_dir_expanded@")
 import aotcompile
 import getopt
 import os