18 files changed, 112222 insertions, 40 deletions

diff --git a/src/plugin/make_xpi.sh b/src/plugin/make_xpi.sh
index cb206db..63fdd01 100755
--- a/src/plugin/make_xpi.sh
+++ b/src/plugin/make_xpi.sh
@@ -3,7 +3,7 @@
 # This script creates a XPI file.
 
 # The structure of an Installable Bundle is documented on-line at:
-# https://developer.mozilla.org/en/Bundles.  Note that Iceweasel
+# https://developer.mozilla.org/en/Bundles  Note that Iceweasel
 # 3.0.12 on Debian x86 is unable to find the library if gcc4 is used
 # in place of gcc3 or if the library name is not truncated to .so.
 # Also running from the GNOME taskbar does not include the DB2
@@ -12,8 +12,20 @@
 # LD_LIBRARY_PATH set resolves this.  DB2 run-time libraries should be
 # statically linked however static verions are not including with DB2
 # v9.5 Express/C.
-cp ../.libs/libflumapplugin.so.0.0.0 \
-platform/Linux_x86-gcc3/plugins/libflumapplugin.so
+
+# As per https://developer.mozilla.org/en/OS_TARGET
+OS_TARGET=`uname -s`
+
+# As per https://developer.mozilla.org/en/XPCOM_ABI
+CPU_ARCH=`uname -m`
+TARGET_COMPILER_ABI=gcc3
+TARGET_XPCOM_ABI=${CPU_ARCH}-${TARGET_COMPILER_ABI}
+
+# As per https://developer.mozilla.org/en/Bundles
+PLATFORM_STRING=${OS_TARGET}_${TARGET_XPCOM_ABI}
+
+install -D ../.libs/libflumapplugin.so.0.0.0 \
+platform/${PLATFORM_STRING}/plugins/libflumapplugin.so
 
 # ZIP is used make the extension as per the instructions at:
 # https://developer.mozilla.org/en/Extension_Packaging