Ship translations in binary tarballs

For some reason, hgettext uses the install hook, not the copy hook.

3 files changed, 19 insertions, 6 deletions

diff --git a/Makefile b/Makefile
index a4d4a7f..5dc87a2 100644
--- a/Makefile
+++ b/Makefile
@@ -71,10 +71,8 @@ TARBALL_FULL_DIR := $(TARBALL_PARENT_DIR)/$(TARBALL_DIR)
 TARBALL := $(TARBALL_DIR).tar.bz2
 maintainer-binary-tarball: all
 	mkdir -p $(TARBALL_FULL_DIR)
-	cabal-dev configure --prefix=$(TOP)/$(TARBALL_FULL_DIR) \
+	cabal-dev install --prefix=$(TOP)/$(TARBALL_FULL_DIR) \
 		--datadir=$(TOP)/$(TARBALL_FULL_DIR) --datasubdir=.
-	cabal-dev build
-	cabal-dev copy
 	cp bustle.sh README $(TARBALL_FULL_DIR)
 	perl -pi -e 's{^    bustle-pcap}{    ./bustle-pcap};' \
 		-e  's{^    bustle}     {    ./bustle.sh};' \
diff --git a/Setup.hs b/Setup.hs
index 18afcaf..9ab758c 100644
--- a/Setup.hs
+++ b/Setup.hs
@@ -53,7 +53,11 @@ writeGetTextConstantsFile pkg lbi flags = do
 getTextConstantsModuleName :: PackageDescription -> ModuleName
 getTextConstantsModuleName pkg_descr =
   ModuleName.fromString $
-    "GetText_" ++ map fixchar (display (packageName pkg_descr))
+    "GetText_" ++ fixedPackageName pkg_descr
+
+-- Cargo-culted from two separate places in Cabal!
+fixedPackageName :: PackageDescription -> String
+fixedPackageName = map fixchar . display . packageName
   where fixchar '-' = '_'
         fixchar c   = c
 
@@ -68,14 +72,22 @@ generateModule pkg lbi =
         "    getMessageCatalogDomain,\n" ++
         "    getMessageCatalogDir\n" ++
         ") where\n"++
-        "\n"
+        "\n" ++
+        "import qualified Control.Exception as Exception\n" ++
+        "import System.Environment (getEnv)\n"
 
     body =
+        "catchIO :: IO a -> (Exception.IOException -> IO a) -> IO a\n" ++
+        "catchIO = Exception.catch\n" ++
+        "\n" ++
         "getMessageCatalogDomain :: IO String\n" ++
         "getMessageCatalogDomain = return " ++ show dom ++ "\n" ++
         "\n" ++
+        "messageCatalogDir :: String\n" ++
+        "messageCatalogDir = " ++ show tar ++ "\n" ++
+        "\n" ++
         "getMessageCatalogDir :: IO FilePath\n" ++
-        "getMessageCatalogDir = return " ++ show tar ++ "\n"
+        "getMessageCatalogDir = catchIO (getEnv \"" ++ fixedPackageName pkg ++ "_localedir\") (\\_ -> return messageCatalogDir)\n"
 
     sMap = customFieldsPD (localPkgDescr lbi)
     dom = getDomainNameDefault sMap (getPackageName lbi)
diff --git a/bustle.sh b/bustle.sh
index 2be1b50..bdf9e51 100755
--- a/bustle.sh
+++ b/bustle.sh
@@ -6,6 +6,9 @@ root="$(dirname $(readlink -f ${0}))"
 bustle_datadir="${root}"
 export bustle_datadir
 
+bustle_localedir="${root}/locale"
+export bustle_localedir
+
 LD_LIBRARY_PATH="${root}/lib:${LD_LIBRARY_PATH}"
 export LD_LIBRARY_PATH