Преглед изворни кода

Fix stupid /usr/lib/usr/lib/ problem

rdb пре 16 година
родитељ
комит
53d39caa55
1 измењених фајлова са 4 додато и 4 уклоњено
  1. 4 4
      makepanda/installpanda.py

+ 4 - 4
makepanda/installpanda.py

@@ -29,8 +29,8 @@ def InstallPanda(destdir="", prefix="/usr", outputdir="built"):
     oscmd("mkdir -p "+destdir+prefix+"/share/panda3d")
     oscmd("mkdir -p "+destdir+prefix+"/share/panda3d")
     oscmd("mkdir -p "+destdir+prefix+"/share/panda3d/direct")
     oscmd("mkdir -p "+destdir+prefix+"/share/panda3d/direct")
     oscmd("mkdir -p "+destdir+prefix+libdir+"/panda3d")
     oscmd("mkdir -p "+destdir+prefix+libdir+"/panda3d")
-    oscmd("mkdir -p "+destdir+prefix+libdir+"/"+os.path.abspath(PPATH+"/../lib-dynload"))
-    oscmd("mkdir -p "+destdir+prefix+libdir+"/"+PPATH+"/site-packages")
+    oscmd("mkdir -p "+destdir+os.path.abspath(PPATH+"/../lib-dynload"))
+    oscmd("mkdir -p "+destdir+PPATH+"/site-packages")
     oscmd("mkdir -p "+destdir+"/etc/ld.so.conf.d")
     oscmd("mkdir -p "+destdir+"/etc/ld.so.conf.d")
     WriteFile(destdir+prefix+"/share/panda3d/direct/__init__.py", "")
     WriteFile(destdir+prefix+"/share/panda3d/direct/__init__.py", "")
     oscmd("sed -e 's@model-cache-@# model-cache-@' -e 's@$THIS_PRC_DIR/[.][.]@"+prefix+"/share/panda3d@' < "+outputdir+"/etc/Config.prc > "+destdir+"/etc/Config.prc")
     oscmd("sed -e 's@model-cache-@# model-cache-@' -e 's@$THIS_PRC_DIR/[.][.]@"+prefix+"/share/panda3d@' < "+outputdir+"/etc/Config.prc > "+destdir+"/etc/Config.prc")
@@ -46,8 +46,8 @@ def InstallPanda(destdir="", prefix="/usr", outputdir="built"):
     oscmd("cp doc/LICENSE                       "+destdir+prefix+"/include/panda3d/LICENSE")
     oscmd("cp doc/LICENSE                       "+destdir+prefix+"/include/panda3d/LICENSE")
     oscmd("cp doc/ReleaseNotes                  "+destdir+prefix+"/share/panda3d/ReleaseNotes")
     oscmd("cp doc/ReleaseNotes                  "+destdir+prefix+"/share/panda3d/ReleaseNotes")
     oscmd("echo '"+prefix+libdir+"/panda3d'>    "+destdir+"/etc/ld.so.conf.d/panda3d.conf")
     oscmd("echo '"+prefix+libdir+"/panda3d'>    "+destdir+"/etc/ld.so.conf.d/panda3d.conf")
-    oscmd("echo '"+prefix+"/share/panda3d' >    "+destdir+prefix+libdir+PPATH+"/panda3d.pth")
-    oscmd("echo '"+prefix+libdir+"/panda3d'>>   "+destdir+prefix+libdir+PPATH+"/panda3d.pth")
+    oscmd("echo '"+prefix+"/share/panda3d' >    "+destdir+PPATH+"/panda3d.pth")
+    oscmd("echo '"+prefix+libdir+"/panda3d'>>   "+destdir+PPATH+"/panda3d.pth")
     oscmd("cp "+outputdir+"/bin/*               "+destdir+prefix+"/bin/")
     oscmd("cp "+outputdir+"/bin/*               "+destdir+prefix+"/bin/")
     for base in os.listdir(outputdir+"/lib"):
     for base in os.listdir(outputdir+"/lib"):
         oscmd("cp "+outputdir+"/lib/"+base+" "+destdir+prefix+libdir+"/panda3d/"+base)
         oscmd("cp "+outputdir+"/lib/"+base+" "+destdir+prefix+libdir+"/panda3d/"+base)