Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 1 Jul 2015 14:21:01 +0000 (UTC)
From:      Mikhail Teterin <mi@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r391068 - head/audio/festival
Message-ID:  <201507011421.t61EL1AS052604@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: mi
Date: Wed Jul  1 14:21:00 2015
New Revision: 391068
URL: https://svnweb.freebsd.org/changeset/ports/391068

Log:
  Fix build on arm (v6). Do not create empty directories.
  
  PR:		200287, 201202
  Submitted by:	Mikael Urankar, avilla

Modified:
  head/audio/festival/Makefile

Modified: head/audio/festival/Makefile
==============================================================================
--- head/audio/festival/Makefile	Wed Jul  1 14:07:57 2015	(r391067)
+++ head/audio/festival/Makefile	Wed Jul  1 14:21:00 2015	(r391068)
@@ -99,7 +99,7 @@ do-configure:
 		${FALSE}; \
 	fi
 	# This step helps non-i386 systems and is harmless on i386
-	-${LN} -s ix86_FreeBSD.mak ${WRKDIR}/$d/config/systems/${ARCH}_unknown.mak
+	-${LN} -s ix86_FreeBSD.mak ${WRKDIR}/$d/config/systems/${ARCH:S/armv6/arm/}_unknown.mak
 .endfor
 	${REINPLACE_CMD} \
 	    -e '/^CFLAGS *=/s|$$| ${CFLAGS}|' \
@@ -111,13 +111,11 @@ do-configure:
 		${LN} -s gcc_defaults.mak ${WRKDIR}/speech_tools/config/compilers/${CC}.mak
 
 do-install:
-	@${MKDIR} ${STAGEDIR}${DATADIR}/lib/voices/english/
-	@${MKDIR} ${STAGEDIR}${DATADIR}/lib/voices/spanish/
-	@${MKDIR} ${STAGEDIR}${DATADIR}/lib/dicts
+	@${MKDIR} ${STAGEDIR}${DATADIR}
 	${CHMOD} -R u+w,a+r,og-w ${FESTIVAL}/lib
 	${FIND} ${FESTIVAL}/lib -type d -print0 | ${XARGS} -0 ${CHMOD} 755
 	${FIND} ${FESTIVAL} -type f -name *.orig -delete
-	cd ${FESTIVAL} && ${CP} -pPR lib examples ${STAGEDIR}${DATADIR}
+	${CP} -pPR ${FESTIVAL}/lib ${FESTIVAL}/examples ${STAGEDIR}${DATADIR}
 	${RM} -rf ${STAGEDIR}${DATADIR}/lib/etc/Makefile ${STAGEDIR}${DATADIR}/lib/etc/*FreeBSD* \
 	    ${STAGEDIR}${DATADIR}/lib/etc/*unknown
 	${INSTALL_PROGRAM} ${FESTIVAL}/lib/etc/*/audsp ${STAGEDIR}${PREFIX}/libexec



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201507011421.t61EL1AS052604>