--- orig.configure.ac	2004-12-22 14:22:18.000000000 -0700
+++ configure.ac	2004-12-22 15:05:08.000000000 -0700
@@ -111,11 +111,21 @@
 
 AC_DEFINE_UNQUOTED(HUGIN_VERSION, $PACKAGE_VERSION)
 if test "x$prefix" != xNONE; then
-    AC_DEFINE_UNQUOTED(INSTALL_LOCALE_DIR, "$prefix/share/locale")
-    AC_DEFINE_UNQUOTED(INSTALL_XRC_DIR, "$prefix/hugin/xrc")
-else
-    AC_DEFINE_UNQUOTED(INSTALL_LOCALE_DIR, "$ac_default_prefix/share/locale")
-    AC_DEFINE_UNQUOTED(INSTALL_XRC_DIR, "$ac_default_prefix/hugin/xrc")
+      if test "$datadir" != '${prefix}/share' ; then
+          AC_DEFINE_UNQUOTED(INSTALL_LOCALE_DIR, "$datadir/locale")
+	  AC_DEFINE_UNQUOTED(INSTALL_XRC_DIR, "$datadir/hugin/xrc")
+      else
+        AC_DEFINE_UNQUOTED(INSTALL_LOCALE_DIR, "$prefix/share/locale")
+        AC_DEFINE_UNQUOTED(INSTALL_XRC_DIR, "$prefix/share/hugin/xrc")
+      fi
+    else
+      if test "$datadir" != '${prefix}/share' ; then
+        AC_DEFINE_UNQUOTED(INSTALL_LOCALE_DIR, "$datadir/locale")
+        AC_DEFINE_UNQUOTED(INSTALL_XRC_DIR, "$datadir/hugin/xrc")
+      else
+        AC_DEFINE_UNQUOTED(INSTALL_LOCALE_DIR, "$ac_default_prefix/share/locale")
+        AC_DEFINE_UNQUOTED(INSTALL_XRC_DIR, "$ac_default_prefix/share/hugin/xrc")
+   fi  
 fi	
 
 #