From 157bceea8a7d964f1ff1d0c09f7cc18a19fa29f5 Mon Sep 17 00:00:00 2001 From: Mikhail Teterin Date: Sun, 25 Sep 2005 15:22:25 +0000 Subject: [PATCH] Append ${LOCALBASE}/include/libarc to CPPFLAGS instead of CONFIGURE_ENV directly to avoid being overruled by the GNUGETOPT's CPPFLAGS settings on 4.x systems. [1] Continue using GMAKE on systems before 5.0, due to a bug in our make there. Reported by: dhw [1] --- audio/timidity++/Makefile | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/audio/timidity++/Makefile b/audio/timidity++/Makefile index 764c0a217db0..c0ee2cef2b56 100644 --- a/audio/timidity++/Makefile +++ b/audio/timidity++/Makefile @@ -24,7 +24,6 @@ CONFLICTS= timidity-0.* # If you don't have X11, type "make -DWITHOUT_X11" or uncomment this. #WITHOUT_X11= yes -#USE_GMAKE= yes USE_BZIP2= yes USE_GETOPT_LONG=yes WANT_GNOME= yes @@ -34,7 +33,8 @@ EXTRACT_AFTER_ARGS=| ${TAR} -xpf - --exclude '*/libarc/*' \ CONFIGURE_ARGS?=--enable-interface=ncurses,vt100,server CONFIGURE_ARGS+=--program-transform-name= --enable-network -CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include/libarc" +CPPFLAGS+= -I${LOCALBASE}/include/libarc +CONFIGURE_ENV+= "CPPFLAGS=${CPPFLAGS}" PLIST_SUB= EUCJP_LOCALE=${EUCJP_LOCALE} TIMID_LIBDIR=${TIMID_LIBDIR} \ ELISPDIR=share/emacs/site-lisp @@ -46,6 +46,10 @@ TIMID_LIBDIR= lib/timidity .include +.if ${OSVERSION} < 500000 +USE_GMAKE= yes +.endif + .if ${.CURDIR} == ${MASTERDIR} MANLANG= "" ja MAN1= timidity.1