diff options
| author | John Marino <marino@FreeBSD.org> | 2014-08-30 13:41:13 +0000 |
|---|---|---|
| committer | John Marino <marino@FreeBSD.org> | 2014-08-30 13:41:13 +0000 |
| commit | 1092eed95dffb08ef3d2a231fd39afe98d17a086 (patch) | |
| tree | f5b83e1b2c59043b9cfd12642090c2faf3444563 /japanese | |
| parent | Unbreak on 9amd64 (diff) | |
japanese/eijiro-fpw: Small fix to cover compressed case
The previous change was tested and needs a small patch to work in all
cases. Patch functioning confirmed by PR submitter
PR: 193061
Submitted by: turutani (kyoto)
Notes
Notes:
svn path=/head/; revision=366618
Diffstat (limited to 'japanese')
| -rw-r--r-- | japanese/eijiro-fpw/Makefile | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/japanese/eijiro-fpw/Makefile b/japanese/eijiro-fpw/Makefile index 25c96fcf6932..b99f6ea0a99d 100644 --- a/japanese/eijiro-fpw/Makefile +++ b/japanese/eijiro-fpw/Makefile @@ -37,11 +37,12 @@ PLIST_DIRS= share/dict/eijiro-fpw/eijiro/data \ # (http://www.alc.co.jp/alcshop/eng/eijiro/) # Avoid copying uncompressed srcfile, it is > 50Mb -.if exists(${WRKDIR}/${SRCFILE}) -MAKE_ARGS+= SRCFILE=${WRKDIR}/${SRCFILE} -.else -MAKE_ARGS+= SRCFILE=${DICT_PATH}/${SRCFILE} +.if exists(${DICT_PATH}/${SRCFILE}) # uncompressed +SOURCE_FILE= ${DICT_PATH}/${SRCFILE} +.else # assume decompression works +SOURCE_FILE= ${WRKDIR}/${SRCFILE} .endif +MAKE_ARGS+= SRCFILE=${SOURCE_FILE:Q} OPTIONS_DEFINE= DOCS @@ -50,7 +51,8 @@ OPTIONS_DEFINE= DOCS post-extract: @if [ -f ${DICT_PATH}/eijiro-original/*.exe ]; then \ lha xiw=${WRKDIR} ${DICT_PATH}/eijiro-original/*.exe '*/${SRCFILE}'; \ - elif [ ! -f ${DICT_PATH}/${SRCFILE} ]; then \ + fi + @if [ ! -f ${SOURCE_FILE:Q} ]; then \ ${ECHO} "###################################################"; \ ${ECHO} "I cannot find a file ${DICT_PATH}/${SRCFILE}"; \ ${ECHO} "Specify the Eijiro Dictionary file with the full path"; \ |