From abbbb1d09fd097e62b0aef2aebfb9e03aaff6060 Mon Sep 17 00:00:00 2001
From: rdb <git@rdb.name>
Date: Thu, 20 Feb 2014 18:05:56 +0000
Subject: [PATCH] Let the installer copy the new 'panda3d' tree instead of the
 panda3d.py file.

---
 direct/src/directscripts/packpanda.nsi | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/direct/src/directscripts/packpanda.nsi b/direct/src/directscripts/packpanda.nsi
index dad5e4beb5..a06ef84ce8 100755
--- a/direct/src/directscripts/packpanda.nsi
+++ b/direct/src/directscripts/packpanda.nsi
@@ -103,8 +103,6 @@ Section "${SMDIRECTORY}" SecCore
         File /r /x CVS /x Opt?-Win32 "${PSOURCE}\direct\filter\*.sha"
         SetOutPath $INSTDIR\direct
         File /r /x CVS /x Opt?-Win32 "${PSOURCE}\direct\*.py"
-        SetOutPath $INSTDIR
-        File "${PSOURCE}\panda3d.py"
         !else
         File /r /x CVS /x Opt?-Win32 "${PSOURCE}\direct\src\directscripts\*"
         SetOutPath $INSTDIR\direct\filter
@@ -112,11 +110,12 @@ Section "${SMDIRECTORY}" SecCore
         SetOutPath $INSTDIR\direct
         File /r /x CVS /x Opt?-Win32 "${PSOURCE}\direct\src\*.py"
         File "${PANDA}\tmp\__init__.py"
-        SetOutPath $INSTDIR
-        File "${PSOURCE}\direct\src\ffi\panda3d.py"
         !endif
         SetOutPath $INSTDIR\pandac
         File /r "${PANDA}\pandac\*.py"
+        SetOutPath $INSTDIR\panda3d
+        File /r "${PANDA}\panda3d\*.py"
+        File /r "${PANDA}\panda3d\*.pyd"
         SetOutPath $INSTDIR\python
         File /r "${PANDA}\python\*"
         RMDir /r "$SMPROGRAMS\${SMDIRECTORY}"