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]
This commit is contained in:
Mikhail Teterin 2005-09-25 15:22:25 +00:00
parent ba5e6bd4e1
commit 157bceea8a
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=143525

View file

@ -24,7 +24,6 @@ CONFLICTS= timidity-0.*
# If you don't have X11, type "make -DWITHOUT_X11" or uncomment this. # If you don't have X11, type "make -DWITHOUT_X11" or uncomment this.
#WITHOUT_X11= yes #WITHOUT_X11= yes
#USE_GMAKE= yes
USE_BZIP2= yes USE_BZIP2= yes
USE_GETOPT_LONG=yes USE_GETOPT_LONG=yes
WANT_GNOME= yes WANT_GNOME= yes
@ -34,7 +33,8 @@ EXTRACT_AFTER_ARGS=| ${TAR} -xpf - --exclude '*/libarc/*' \
CONFIGURE_ARGS?=--enable-interface=ncurses,vt100,server CONFIGURE_ARGS?=--enable-interface=ncurses,vt100,server
CONFIGURE_ARGS+=--program-transform-name= --enable-network 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} \ PLIST_SUB= EUCJP_LOCALE=${EUCJP_LOCALE} TIMID_LIBDIR=${TIMID_LIBDIR} \
ELISPDIR=share/emacs/site-lisp ELISPDIR=share/emacs/site-lisp
@ -46,6 +46,10 @@ TIMID_LIBDIR= lib/timidity
.include <bsd.port.pre.mk> .include <bsd.port.pre.mk>
.if ${OSVERSION} < 500000
USE_GMAKE= yes
.endif
.if ${.CURDIR} == ${MASTERDIR} .if ${.CURDIR} == ${MASTERDIR}
MANLANG= "" ja MANLANG= "" ja
MAN1= timidity.1 MAN1= timidity.1