From 2ea7149e422229c0ae445cb68653728fca1d6647 Mon Sep 17 00:00:00 2001
From: rdb <git@rdb.name>
Date: Wed, 19 Nov 2014 12:31:19 +0000
Subject: [PATCH] Installer should get direct tree from built/direct

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

diff --git a/direct/src/directscripts/packpanda.nsi b/direct/src/directscripts/packpanda.nsi
index a57514c799..73c9011d9a 100755
--- a/direct/src/directscripts/packpanda.nsi
+++ b/direct/src/directscripts/packpanda.nsi
@@ -97,20 +97,11 @@ Section "${SMDIRECTORY}" SecCore
         SetOutPath $INSTDIR\etc
         File /r "${PANDACONF}\*"
         SetOutPath $INSTDIR\direct\directscripts
-        !ifdef PPGAME
-        File /r /x CVS /x Opt?-Win32 "${PSOURCE}\direct\directscripts\*"
+        File /r /x CVS /x Opt?-Win32 "${PANDA}\direct\directscripts\*"
         SetOutPath $INSTDIR\direct\filter
-        File /r /x CVS /x Opt?-Win32 "${PSOURCE}\direct\filter\*.sha"
+        File /r /x CVS /x Opt?-Win32 "${PANDA}\direct\filter\*.sha"
         SetOutPath $INSTDIR\direct
-        File /r /x CVS /x Opt?-Win32 "${PSOURCE}\direct\*.py"
-        !else
-        File /r /x CVS /x Opt?-Win32 "${PSOURCE}\direct\src\directscripts\*"
-        SetOutPath $INSTDIR\direct\filter
-        File /r /x CVS /x Opt?-Win32 "${PSOURCE}\direct\src\filter\*.sha"
-        SetOutPath $INSTDIR\direct
-        File /r /x CVS /x Opt?-Win32 "${PSOURCE}\direct\src\*.py"
-        File "${PANDA}\tmp\__init__.py"
-        !endif
+        File /r /x CVS /x Opt?-Win32 "${PANDA}\direct\*.py"
         Delete "$INSTDIR\panda3d.py"
         Delete "$INSTDIR\panda3d.pyc"
         Delete "$INSTDIR\panda3d.pyo"