Преглед на файлове

tweaks for install on ttown

David Rose преди 23 години
родител
ревизия
8c52cab55e
променени са 2 файла, в които са добавени 3 реда и са изтрити 3 реда
  1. 1 1
      direct/src/ffi/genPyCode
  2. 2 2
      direct/src/showbase/sitecustomize.py

+ 1 - 1
direct/src/ffi/genPyCode

@@ -62,6 +62,6 @@ fi
 
 
 if [ "$firstarg" = "install" ]; then
 if [ "$firstarg" = "install" ]; then
     # as installed on a machine without ctattach etc.
     # as installed on a machine without ctattach etc.
-    exec bin/ppython -d bin/generatePythonCode -v -d lib/py -e ../direct/src/extensions -i libdtoolconfig libpandaexpress libpanda libpandaphysics libdirect $extra_genPyCode_libs
+    exec install/bin/ppython -d install/bin/generatePythonCode -v -d install/lib/py -e direct/src/extensions -i libdtoolconfig libpandaexpress libpanda libpandaphysics libdirect $extra_genPyCode_libs
     exit 1
     exit 1
 fi
 fi

+ 2 - 2
direct/src/showbase/sitecustomize.py

@@ -52,7 +52,7 @@ def getPackages():
         # we're running from the directory above all of the source
         # we're running from the directory above all of the source
         # trees; look within these directories for the *.pth files.
         # trees; look within these directories for the *.pth files.
 
 
-        searchstr = os.path.join('*', 'etc', '*.pth')
+        searchstr = os.path.join('*', 'src', 'configfiles', '*.pth')
         filenames = glob.glob(searchstr)
         filenames = glob.glob(searchstr)
         if len(filenames) == 0:
         if len(filenames) == 0:
             print ''
             print ''
@@ -61,7 +61,7 @@ def getPackages():
             print ''
             print ''
             
             
         for filename in filenames:
         for filename in filenames:
-            tree = os.path.dirname(os.path.dirname(filename))
+            tree = os.path.dirname(os.path.dirname(os.path.dirname(filename)))
             readpth(tree, filename)
             readpth(tree, filename)
 
 
     else:
     else: