* Remove old EXPANDED_ variables from code. These have been cleaned up from r120.

src/libs/python/bongo-python-wrapper.in

@@ -11,10 +11,10 @@ if binpath.endswith("bin"):
     newpath = []
     if envpath is not None:
         newpath = envpath.split(os.pathsep)
-    newpath.insert(0, "@EXPANDED_PYTHONDIR@")
+    newpath.insert(0, "@PYTHONDIR@")
     os.environ["PYTHONPATH"] = os.pathsep.join(newpath)
 
-    script = os.path.join("@EXPANDED_PKGLIBEXECDIR@",
+    script = os.path.join("@PKGLIBEXECDIR@",
                           os.path.basename(sys.argv[0]) + ".py")
 else:
     script = os.path.join(binpath, binname + ".py")

src/libs/python/bongo/Xpl.py.in

@@ -20,7 +20,7 @@ DEFAULT_RANDSEED_PATH = '@XPL_DEFAULT_RANDSEED_PATH@'
 DEFAULT_SLAPD_PATH = '@DEFAULT_SLAPD_PATH@'
 DEFAULT_SLAPD_SCHEMA_DIR = '@DEFAULT_SLAPD_SCHEMA_DIR@'
 
-DEFAULT_LIBEXEC_DIR = '@EXPANDED_PKGLIBEXECDIR@'
+DEFAULT_LIBEXEC_DIR = '@PKGLIBEXECDIR@'
 
 # Configured Bongo user.  If this looks funky, it's because we're
 # substituting in some potentially empty variables from autoconf.