From 979c7156b7e064ef5ebe1edeec8845697421b258 Mon Sep 17 00:00:00 2001 From: Trevor Johnson Date: Sun, 28 Sep 2003 07:20:31 +0000 Subject: Use the INFO variable. suggested by: sf --- mail/elmo-devel/Makefile | 7 ++----- mail/elmo/Makefile | 7 ++----- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/mail/elmo-devel/Makefile b/mail/elmo-devel/Makefile index a463026ff34d..e5ca947ae6ba 100644 --- a/mail/elmo-devel/Makefile +++ b/mail/elmo-devel/Makefile @@ -20,6 +20,7 @@ LIB_DEPENDS= iconv.3:${PORTSDIR}/converters/libiconv \ GNU_CONFIGURE= yes CONFIGURE_ENV+= CFLAGS="${PTHREAD_CFLAGS}" LDFLAGS="${PTHREAD_LIBS}" +INFO= elmo MAKE_ENV= PTHREAD_LIBS="${PTHREAD_LIBS}" \ PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" MAN1= elmo.1 elmoconf.pl.1 @@ -33,11 +34,7 @@ pre-extract: @sleep 10 pre-install: - ${ECHO_CMD} @unexec install-info --delete %D/info/elmo.info %D/info/dir\ - > ${PLIST} - ${ECHO_CMD} @exec install-info --info-dir=%D/info %D/info/elmo.info \ - >> ${PLIST} - ${ECHO_CMD} info/elmo.info >> ${PLIST} + ${RM} -f ${PLIST} .for ii in elmo elmoconf.pl ${ECHO_CMD} bin/${ii} >> ${PLIST} .endfor diff --git a/mail/elmo/Makefile b/mail/elmo/Makefile index a463026ff34d..e5ca947ae6ba 100644 --- a/mail/elmo/Makefile +++ b/mail/elmo/Makefile @@ -20,6 +20,7 @@ LIB_DEPENDS= iconv.3:${PORTSDIR}/converters/libiconv \ GNU_CONFIGURE= yes CONFIGURE_ENV+= CFLAGS="${PTHREAD_CFLAGS}" LDFLAGS="${PTHREAD_LIBS}" +INFO= elmo MAKE_ENV= PTHREAD_LIBS="${PTHREAD_LIBS}" \ PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" MAN1= elmo.1 elmoconf.pl.1 @@ -33,11 +34,7 @@ pre-extract: @sleep 10 pre-install: - ${ECHO_CMD} @unexec install-info --delete %D/info/elmo.info %D/info/dir\ - > ${PLIST} - ${ECHO_CMD} @exec install-info --info-dir=%D/info %D/info/elmo.info \ - >> ${PLIST} - ${ECHO_CMD} info/elmo.info >> ${PLIST} + ${RM} -f ${PLIST} .for ii in elmo elmoconf.pl ${ECHO_CMD} bin/${ii} >> ${PLIST} .endfor -- cgit v1.2.3