Fixed antiword recipe

This commit is contained in:
Scott McCreary
2013-12-25 12:26:43 -08:00
parent 2ad1e93c7c
commit f16ec6872a
2 changed files with 28 additions and 18 deletions

View File

@@ -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
}

View File

@@ -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)
+