From f16ec6872a0df57f76c8a85e20551fb7194dcca4 Mon Sep 17 00:00:00 2001
From: Scott McCreary <scottmc2@gmail.com>
Date: Wed, 25 Dec 2013 12:26:43 -0800
Subject: [PATCH] Fixed antiword recipe

---
 app-text/antiword/antiword-0.37.recipe        | 38 ++++++++++++-------
 app-text/antiword/patches/antiword-0.37.patch |  8 ++--
 2 files changed, 28 insertions(+), 18 deletions(-)

diff --git a/app-text/antiword/antiword-0.37.recipe b/app-text/antiword/antiword-0.37.recipe
index 43db486d6..aa1b51eeb 100644
--- a/app-text/antiword/antiword-0.37.recipe
+++ b/app-text/antiword/antiword-0.37.recipe
@@ -15,33 +15,43 @@ COPYRIGHT="1998-2005 A.J. van Os"
 ARCHITECTURES="x86_gcc2 ?x86 ?x86_64"
 
 PROVIDES="
-		antiword = $portVersion
-		cmd:antiword = $portVersion
-"
+	antiword = $portVersion
+	cmd:antiword = $portVersion
+	cmd:kantiword =$portVersion
+	"
 
 REQUIRES="
-		haiku >= $haikuVersion
-"
+	haiku >= $haikuVersion
+	"
 
 BUILD_REQUIRES="
-"
+	haiku_devel >= $haikuVersion
+	"
 
 BUILD_PREREQUIRES="
-		haiku_devel >= $haikuVersion
-		cmd:gcc
-		cmd:make
-"
+	cmd:gcc
+	cmd:make
+	"
 
 PATCHES="
-		antiword-0.37.patch
-"
+	antiword-0.37.patch
+	"
+
+USER_SETTINGS_FILES="
+	settings/antiword_settings
+	"
 
 BUILD()
 {
-	make --makefile Makefile.haiku
+
+	make --makefile Makefile.haiku BINDIR=$binDir \
+		ANTIWORD_SETTINGS=$settingsDir/antiword \
+		ANTIWORD_DATA=$dataDir/antiword
 }
 
 INSTALL()
 {
-	make --makefile Makefile.haiku global_install
+	make --makefile Makefile.haiku global_install BINDIR=$binDir \
+		ANTIWORD_SETTINGS=$settingsDir/antiword \
+		ANTIWORD_DATA=$dataDir/antiword
 }
diff --git a/app-text/antiword/patches/antiword-0.37.patch b/app-text/antiword/patches/antiword-0.37.patch
index 02cf41c35..117c4e06a 100644
--- a/app-text/antiword/patches/antiword-0.37.patch
+++ b/app-text/antiword/patches/antiword-0.37.patch
@@ -51,11 +51,11 @@ diff -Naur antiword-0.37/Makefile.haiku antiword-0.37-haiku/Makefile.haiku
 +	antiword\
 +	kantiword
 +
-+LOCAL_INSTALL_DIR = $(HOME)/bin
-+LOCAL_RESOURCES_DIR = $(HOME)/.antiword
++LOCAL_INSTALL_DIR = $(BINDIR)
++LOCAL_RESOURCES_DIR = $(ANTIWORD_SETTINGS)
 +
-+GLOBAL_INSTALL_DIR = /boot/common/bin
-+GLOBAL_RESOURCES_DIR = /boot/common/data/antiword
++GLOBAL_INSTALL_DIR = $(BINDIR)
++GLOBAL_RESOURCES_DIR = $(ANTIWORD_DATA)
 +
 +all:		$(PROGS)
 +