$NetBSD$

--- genxpi.orig	2010-01-31 16:31:29.000000000 +0000
+++ genxpi
@@ -55,7 +55,11 @@ cd "$6"
 targetDir=`pwd`
 cd "$cwd"
 
-platform=${osArch}_${xpcomAbi}
+if [ -z "${xpcomAbi}" ]; then
+  platform=${osArch}
+else
+  platform=${osArch}_${xpcomAbi}
+fi
 # Prepare chrome.manifest
 cat  ${srcDir}/package/chrome.manifest > ${targetDir}/chrome.manifest
 
@@ -133,9 +137,14 @@ chmod 755 "${targetDir}/wrappers/gpg-age
 cd ${srcDir}/package
 
 enigmimeDll=${libPrefix}enigmime${dllSuffix}
-enigDllFile=platform/${platform}/components/${libPrefix}enigmime-${xpcomAbi}${dllSuffix}
 ipcDll=${libPrefix}ipc${dllSuffix}
-ipcDllFile=platform/${platform}/components/${libPrefix}ipc-${xpcomAbi}${dllSuffix}
+if [ -z ${xpcomAbi} ]; then
+  enigDllFile=platform/${platform}/components/${libPrefix}enigmime${dllSuffix}
+  ipcDllFile=platform/${platform}/components/${libPrefix}ipc${dllSuffix}
+else
+  enigDllFile=platform/${platform}/components/${libPrefix}enigmime-${xpcomAbi}${dllSuffix}
+  ipcDllFile=platform/${platform}/components/${libPrefix}ipc${dllSuffix}
+fi
 
 cd "$targetDir"
 
