From 1026ef6b029e2e275cdea0680be042a21c679240 Mon Sep 17 00:00:00 2001 From: "tschmelcher@google.com" Date: Fri, 17 Jul 2009 20:55:10 +0000 Subject: O3D 64-bit Linux: Symlink the 32-bit plugin into the plugin install dirs too so that it will work OOB for users that have installed 32-bit browsers on 64-bit systems (e.g., Swiftfox). Review URL: http://codereview.chromium.org/155705 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@20998 0039d316-1c4b-4281-b951-d872f2087c98 --- o3d/installer/linux/build.scons | 1 - o3d/installer/linux/debian_amd64/dirs | 7 ------- o3d/installer/linux/debian_amd64/links | 7 +++++++ 3 files changed, 7 insertions(+), 8 deletions(-) delete mode 100644 o3d/installer/linux/debian_amd64/dirs diff --git a/o3d/installer/linux/build.scons b/o3d/installer/linux/build.scons index 5be980e..2a0d609 100644 --- a/o3d/installer/linux/build.scons +++ b/o3d/installer/linux/build.scons @@ -127,7 +127,6 @@ if subprocess.Popen(["which", "dpkg-buildpackage"], BuildDebianPackage(["debian_amd64/changelog", "debian_amd64/control", - "debian_amd64/dirs", "debian_amd64/google-o3d.install", "debian_amd64/links", "debian_amd64/postinst", diff --git a/o3d/installer/linux/debian_amd64/dirs b/o3d/installer/linux/debian_amd64/dirs deleted file mode 100644 index aa070db..0000000 --- a/o3d/installer/linux/debian_amd64/dirs +++ /dev/null @@ -1,7 +0,0 @@ -usr/lib/xulrunner/plugins -usr/lib/mozilla/plugins -usr/lib/iceape/plugins -usr/lib/iceweasel/plugins -usr/lib/firefox/plugins -usr/lib/midbrowser/plugins -usr/lib/xulrunner-addons/plugins diff --git a/o3d/installer/linux/debian_amd64/links b/o3d/installer/linux/debian_amd64/links index 82b05dfa..51151e1 100644 --- a/o3d/installer/linux/debian_amd64/links +++ b/o3d/installer/linux/debian_amd64/links @@ -1,3 +1,10 @@ /opt/google/o3d/libCgGL.so /usr/lib32/libCgGL.so /opt/google/o3d/libCg.so /usr/lib32/libCg.so /opt/google/o3d/libGLEW.so.1.5 /usr/lib32/libGLEW.so.1.5 +/opt/google/o3d/libnpo3dautoplugin.so /usr/lib/iceape/plugins/libnpo3dautoplugin.so +/opt/google/o3d/libnpo3dautoplugin.so /usr/lib/iceweasel/plugins/libnpo3dautoplugin.so +/opt/google/o3d/libnpo3dautoplugin.so /usr/lib/mozilla/plugins/libnpo3dautoplugin.so +/opt/google/o3d/libnpo3dautoplugin.so /usr/lib/firefox/plugins/libnpo3dautoplugin.so +/opt/google/o3d/libnpo3dautoplugin.so /usr/lib/midbrowser/plugins/libnpo3dautoplugin.so +/opt/google/o3d/libnpo3dautoplugin.so /usr/lib/xulrunner/plugins/libnpo3dautoplugin.so +/opt/google/o3d/libnpo3dautoplugin.so /usr/lib/xulrunner-addons/plugins/libnpo3dautoplugin.so -- cgit v1.1