diff --git a/makepanda/installpanda.py b/makepanda/installpanda.py index 5b9f7b1a73..9f32f4f03b 100644 --- a/makepanda/installpanda.py +++ b/makepanda/installpanda.py @@ -106,21 +106,21 @@ def InstallPanda(destdir="", prefix="/usr", outputdir="built"): PEXEC = os.path.join(os.path.dirname(sys.executable), os.readlink(sys.executable)) else: PEXEC = sys.executable - oscmd("mkdir -p "+destdir+prefix+"/bin") - oscmd("mkdir -p "+destdir+prefix+"/include") - oscmd("mkdir -p "+destdir+prefix+"/share/panda3d") - oscmd("mkdir -p "+destdir+prefix+"/share/panda3d/direct") - oscmd("mkdir -p "+destdir+prefix+"/share/mime-info") - oscmd("mkdir -p "+destdir+prefix+"/share/mime/packages") - oscmd("mkdir -p "+destdir+prefix+"/share/application-registry") - oscmd("mkdir -p "+destdir+prefix+"/share/applications") - oscmd("mkdir -p "+destdir+prefix+libdir+"/panda3d") - oscmd("mkdir -p "+destdir+PPATH) + oscmd("mkdir -m 0755 -p "+destdir+prefix+"/bin") + oscmd("mkdir -m 0755 -p "+destdir+prefix+"/include") + oscmd("mkdir -m 0755 -p "+destdir+prefix+"/share/panda3d") + oscmd("mkdir -m 0755 -p "+destdir+prefix+"/share/panda3d/direct") + oscmd("mkdir -m 0755 -p "+destdir+prefix+"/share/mime-info") + oscmd("mkdir -m 0755 -p "+destdir+prefix+"/share/mime/packages") + oscmd("mkdir -m 0755 -p "+destdir+prefix+"/share/application-registry") + oscmd("mkdir -m 0755 -p "+destdir+prefix+"/share/applications") + oscmd("mkdir -m 0755 -p "+destdir+prefix+libdir+"/panda3d") + oscmd("mkdir -m 0755 -p "+destdir+PPATH) if (sys.platform.startswith("freebsd")): - oscmd("mkdir -p "+destdir+prefix+"/etc") - oscmd("mkdir -p "+destdir+"/usr/local/libdata/ldconfig") + oscmd("mkdir -m 0755 -p "+destdir+prefix+"/etc") + oscmd("mkdir -m 0755 -p "+destdir+"/usr/local/libdata/ldconfig") else: - oscmd("mkdir -p "+destdir+"/etc/ld.so.conf.d") + oscmd("mkdir -m 0755 -p "+destdir+"/etc/ld.so.conf.d") WriteFile(destdir+prefix+"/share/panda3d/direct/__init__.py", "") Configrc = ReadFile(outputdir+"/etc/Config.prc") Configrc = Configrc.replace("model-path $THIS_PRC_DIR/..", "model-path "+prefix+"/share/panda3d") @@ -173,23 +173,23 @@ def InstallPanda(destdir="", prefix="/usr", outputdir="built"): def InstallRuntime(destdir="", prefix="/usr", outputdir="built"): if (not prefix.startswith("/")): prefix = "/" + prefix - oscmd("mkdir -p "+destdir+prefix+"/bin") - oscmd("mkdir -p "+destdir+prefix+"/share/mime-info") - oscmd("mkdir -p "+destdir+prefix+"/share/mime/packages") - oscmd("mkdir -p "+destdir+prefix+"/share/application-registry") - oscmd("mkdir -p "+destdir+prefix+"/share/applications") + oscmd("mkdir -m 0755 -p "+destdir+prefix+"/bin") + oscmd("mkdir -m 0755 -p "+destdir+prefix+"/share/mime-info") + oscmd("mkdir -m 0755 -p "+destdir+prefix+"/share/mime/packages") + oscmd("mkdir -m 0755 -p "+destdir+prefix+"/share/application-registry") + oscmd("mkdir -m 0755 -p "+destdir+prefix+"/share/applications") if (os.path.exists(outputdir+"/plugins/nppanda3d.so")): - oscmd("mkdir -p "+destdir+prefix+libdir) + oscmd("mkdir -m 0755 -p "+destdir+prefix+libdir) oscmd("cp "+outputdir+"/plugins/nppanda3d.so "+destdir+prefix+libdir+"/nppanda3d.so") if sys.platform.startswith("freebsd"): - oscmd("mkdir -p "+destdir+prefix+libdir+"/browser_plugins/symlinks/gecko19") - oscmd("mkdir -p "+destdir+prefix+libdir+"/libxul/plugins") + oscmd("mkdir -m 0755 -p "+destdir+prefix+libdir+"/browser_plugins/symlinks/gecko19") + oscmd("mkdir -m 0755 -p "+destdir+prefix+libdir+"/libxul/plugins") oscmd("ln -s "+prefix+libdir+"/nppanda3d.so "+destdir+prefix+libdir+"/browser_plugins/symlinks/gecko19/nppanda3d.so") oscmd("ln -s "+prefix+libdir+"/nppanda3d.so "+destdir+prefix+libdir+"/libxul/plugins/nppanda3d.so") else: - 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("mkdir -m 0755 -p "+destdir+prefix+libdir+"/mozilla/plugins") + oscmd("mkdir -m 0755 -p "+destdir+prefix+libdir+"/mozilla-firefox/plugins") + oscmd("mkdir -m 0755 -p "+destdir+prefix+libdir+"/xulrunner-addons/plugins") oscmd("ln -s "+prefix+libdir+"/nppanda3d.so "+destdir+prefix+libdir+"/mozilla/plugins/nppanda3d.so") oscmd("ln -s "+prefix+libdir+"/nppanda3d.so "+destdir+prefix+libdir+"/mozilla-firefox/plugins/nppanda3d.so") oscmd("ln -s "+prefix+libdir+"/nppanda3d.so "+destdir+prefix+libdir+"/xulrunner-addons/plugins/nppanda3d.so") diff --git a/makepanda/makepanda.py b/makepanda/makepanda.py index 42f8249f1f..39f8ace32a 100755 --- a/makepanda/makepanda.py +++ b/makepanda/makepanda.py @@ -5236,7 +5236,7 @@ def MakeInstallerLinux(): PV = PYTHONV.replace("python", "") if (os.path.isdir("targetroot")): oscmd("chmod -R 755 targetroot") oscmd("rm -rf targetroot data.tar.gz control.tar.gz panda3d.spec") - oscmd("mkdir targetroot") + oscmd("mkdir --mode=0755 targetroot") # Invoke installpanda.py to install it into a temporary dir if RUNTIME: