o Fix for undesired error message in apel-emacs20.

o Make more simple in Makefile by moving declaration of variables.

Submitted by:	maintainer
This commit is contained in:
Jun Kuriyama 1999-01-24 03:46:05 +00:00
parent 7315f379b5
commit fa59bdaac7
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=16280
4 changed files with 18 additions and 8 deletions

View File

@ -3,7 +3,7 @@
# Date created: 23 September 1998
# Whom: Shigeyuki FUKUSHIMA <shige@kuis.kyoto-u.ac.jp>
#
# $Id: Makefile,v 1.1.1.1 1999/01/02 13:26:51 kuriyama Exp $
# $Id: Makefile,v 1.2 1999/01/11 10:27:46 asami Exp $
#
DISTNAME= apel-${APEL_VER}
@ -30,15 +30,18 @@ REQUIRE_SETUPEL= YES
# target name for make build
ALL_TARGET?= elc
.if defined(EMACS_PORT)
PKGNAME= apel-${EMACS_PORT}-${APEL_VER}
EMACS_CMD= ${PREFIX}/bin/${EMACS_NAME}-${EMACS_VER}
# if RUN_DEPENDS emacs port name has the suffix `-common'
.if !defined(HAVE_COMMON_PORT)
HAVE_COMMON_PORT= NO
.endif
# if RUN_DEPENDS emacs needs setup elisp
.if !defined(REQUIRE_SETUPEL)
REQUIRE_SETUPEL= NO
.endif
.if defined(EMACS_PORT)
PKGNAME= apel-${EMACS_PORT}-${APEL_VER}
EMACS_CMD= ${PREFIX}/bin/${EMACS_NAME}-${EMACS_VER}
BUILD_DEPENDS= ${EMACS_CMD}:${PORTSDIR}/editors/${EMACS_PORT}
.if defined(HAVE_COMMON_PORT) && (${HAVE_COMMON_PORT} == "YES")
RUN_DEPENDS= ${EMACS_CMD}:${PORTSDIR}/editors/${EMACS_PORT}-common

View File

@ -4,9 +4,11 @@ TARGETS='apel-setup.el'
for i in ${TARGETS}
do
if [ -f ${WRKDIR}/${i}.in ]; then
cat ${WRKDIR}/${i}.in | /usr/bin/sed \
-e "s;@@PREFIX@@;${PREFIX};g" \
-e "s;@@EMACS_LIBDIR@@;${EMACS_LIBDIR};g" \
-e "s;@@EMACS_VER@@;${EMACS_VER};g" \
> ${WRKDIR}/${i}
fi
done

View File

@ -3,7 +3,7 @@
# Date created: 23 September 1998
# Whom: Shigeyuki FUKUSHIMA <shige@kuis.kyoto-u.ac.jp>
#
# $Id: Makefile,v 1.1.1.1 1999/01/02 13:26:51 kuriyama Exp $
# $Id: Makefile,v 1.2 1999/01/11 10:27:46 asami Exp $
#
DISTNAME= apel-${APEL_VER}
@ -30,15 +30,18 @@ REQUIRE_SETUPEL= YES
# target name for make build
ALL_TARGET?= elc
.if defined(EMACS_PORT)
PKGNAME= apel-${EMACS_PORT}-${APEL_VER}
EMACS_CMD= ${PREFIX}/bin/${EMACS_NAME}-${EMACS_VER}
# if RUN_DEPENDS emacs port name has the suffix `-common'
.if !defined(HAVE_COMMON_PORT)
HAVE_COMMON_PORT= NO
.endif
# if RUN_DEPENDS emacs needs setup elisp
.if !defined(REQUIRE_SETUPEL)
REQUIRE_SETUPEL= NO
.endif
.if defined(EMACS_PORT)
PKGNAME= apel-${EMACS_PORT}-${APEL_VER}
EMACS_CMD= ${PREFIX}/bin/${EMACS_NAME}-${EMACS_VER}
BUILD_DEPENDS= ${EMACS_CMD}:${PORTSDIR}/editors/${EMACS_PORT}
.if defined(HAVE_COMMON_PORT) && (${HAVE_COMMON_PORT} == "YES")
RUN_DEPENDS= ${EMACS_CMD}:${PORTSDIR}/editors/${EMACS_PORT}-common

View File

@ -4,9 +4,11 @@ TARGETS='apel-setup.el'
for i in ${TARGETS}
do
if [ -f ${WRKDIR}/${i}.in ]; then
cat ${WRKDIR}/${i}.in | /usr/bin/sed \
-e "s;@@PREFIX@@;${PREFIX};g" \
-e "s;@@EMACS_LIBDIR@@;${EMACS_LIBDIR};g" \
-e "s;@@EMACS_VER@@;${EMACS_VER};g" \
> ${WRKDIR}/${i}
fi
done