Browse Source

A few lib64 fixes

rdb 16 years ago
parent
commit
aa57e0e96c
1 changed files with 9 additions and 9 deletions
  1. 9 9
      makepanda/installpanda.py

+ 9 - 9
makepanda/installpanda.py

@@ -131,9 +131,9 @@ def InstallPanda(destdir="", prefix="/usr", outputdir="built"):
     WriteApplicationsFile(destdir+prefix+"/share/application-registry/panda3d.applications", APP_INFO, MIME_INFO)
     oscmd("cp makepanda/pview.desktop           "+destdir+prefix+"/share/applications/pview.desktop")
     if (os.path.exists(outputdir+"/lib/nppanda3d.so")):
-        oscmd("ln -s "+prefix+libdir+"/panda3d/nppanda3d.so "+destdir+prefix+"/lib/mozilla/plugins/nppanda3d.so")
-        oscmd("ln -s "+prefix+libdir+"/panda3d/nppanda3d.so "+destdir+prefix+"/lib/mozilla-firefox/plugins/nppanda3d.so")
-        oscmd("ln -s "+prefix+libdir+"/panda3d/nppanda3d.so "+destdir+prefix+"/lib/xulrunner-addons/plugins/nppanda3d.so")
+        oscmd("ln -s "+prefix+libdir+"/panda3d/nppanda3d.so "+destdir+prefix+libdir+"/mozilla/plugins/nppanda3d.so")
+        oscmd("ln -s "+prefix+libdir+"/panda3d/nppanda3d.so "+destdir+prefix+libdir+"/mozilla-firefox/plugins/nppanda3d.so")
+        oscmd("ln -s "+prefix+libdir+"/panda3d/nppanda3d.so "+destdir+prefix+libdir+"/xulrunner-addons/plugins/nppanda3d.so")
     oscmd("cp doc/LICENSE                       "+destdir+prefix+"/share/panda3d/LICENSE")
     oscmd("cp doc/LICENSE                       "+destdir+prefix+"/include/panda3d/LICENSE")
     oscmd("cp doc/ReleaseNotes                  "+destdir+prefix+"/share/panda3d/ReleaseNotes")
@@ -165,13 +165,13 @@ def InstallRuntime(destdir="", prefix="/usr", outputdir="built"):
     oscmd("mkdir -p "+destdir+prefix+"/share/applications")
     oscmd("mkdir -p "+destdir+prefix+libdir+"/panda3d")
     if (os.path.exists(outputdir+"/lib/nppanda3d.so")):
-        oscmd("mkdir -p "+destdir+prefix+"/lib/mozilla/plugins")
-        oscmd("mkdir -p "+destdir+prefix+"/lib/mozilla-firefox/plugins")
-        oscmd("mkdir -p "+destdir+prefix+"/lib/xulrunner-addons/plugins")
+        oscmd("mkdir -p "+destdir+prefix+libdir+"/mozilla/plugins")
+        oscmd("mkdir -p "+destdir+prefix+libdir+"/mozilla-firefox/plugins")
+        oscmd("mkdir -p "+destdir+prefix+libdir+"/xulrunner-addons/plugins")
         oscmd("cp "+outputdir+"/lib/nppanda3d.so            "+destdir+prefix+libdir+"/panda3d/nppanda3d.so")
-        oscmd("ln -s "+prefix+libdir+"/panda3d/nppanda3d.so "+destdir+prefix+"/lib/mozilla/plugins/nppanda3d.so")
-        oscmd("ln -s "+prefix+libdir+"/panda3d/nppanda3d.so "+destdir+prefix+"/lib/mozilla-firefox/plugins/nppanda3d.so")
-        oscmd("ln -s "+prefix+libdir+"/panda3d/nppanda3d.so "+destdir+prefix+"/lib/xulrunner-addons/plugins/nppanda3d.so")
+        oscmd("ln -s "+prefix+libdir+"/panda3d/nppanda3d.so "+destdir+prefix+libdir+"/mozilla/plugins/nppanda3d.so")
+        oscmd("ln -s "+prefix+libdir+"/panda3d/nppanda3d.so "+destdir+prefix+libdir+"/mozilla-firefox/plugins/nppanda3d.so")
+        oscmd("ln -s "+prefix+libdir+"/panda3d/nppanda3d.so "+destdir+prefix+libdir+"/xulrunner-addons/plugins/nppanda3d.so")
     WriteMimeFile(destdir+prefix+"/share/mime-info/panda3d-runtime.mime", MIME_INFO_PLUGIN)
     WriteKeysFile(destdir+prefix+"/share/mime-info/panda3d-runtime.keys", MIME_INFO_PLUGIN)
     WriteMimeXMLFile(destdir+prefix+"/share/mime/packages/panda3d-runtime.xml", MIME_INFO_PLUGIN)