From d18f226684c1ce002c95c50937afcc534784cf14 Mon Sep 17 00:00:00 2001
From: David Rose <david@ddrose.com>
Date: Fri, 15 Jan 2010 19:32:29 +0000
Subject: [PATCH] fix python subdirectory issue

---
 direct/src/p3d/AppRunner.py | 2 +-
 direct/src/p3d/Packager.py  | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/direct/src/p3d/AppRunner.py b/direct/src/p3d/AppRunner.py
index 105fea4297..3c1136a155 100644
--- a/direct/src/p3d/AppRunner.py
+++ b/direct/src/p3d/AppRunner.py
@@ -677,7 +677,7 @@ class AppRunner(DirectObject):
 
         self.initPackedAppEnvironment()
 
-        # Mount the Multifile under /mf, by convention.
+        # Mount the Multifile under self.multifileRoot.
         vfs.mount(mf, self.multifileRoot, vfs.MFReadOnly)
         VFSImporter.reloadSharedPackages()
 
diff --git a/direct/src/p3d/Packager.py b/direct/src/p3d/Packager.py
index 4105b73d25..2750b98c36 100644
--- a/direct/src/p3d/Packager.py
+++ b/direct/src/p3d/Packager.py
@@ -1472,6 +1472,7 @@ class Packager:
 
             filename = file.newName.rsplit('.', 1)[0]
             moduleName = filename.replace("/", ".")
+            newName = moduleName
             if moduleName.endswith('.__init__'):
                 moduleName = moduleName.rsplit('.', 1)[0]
 
@@ -1480,7 +1481,7 @@ class Packager:
                 # deal with it again.
                 return
 
-            self.freezer.addModule(moduleName, newName = moduleName,
+            self.freezer.addModule(moduleName, newName = newName,
                                    filename = file.filename)
 
         def addEggFile(self, file):