diff options
| author | Volker Stolz <vs@FreeBSD.org> | 2005-04-25 17:08:32 +0000 |
|---|---|---|
| committer | Volker Stolz <vs@FreeBSD.org> | 2005-04-25 17:08:32 +0000 |
| commit | 64bbb9428335856929fa7649f702a137d867693e (patch) | |
| tree | 7f5eea45b1bf6de69744ef7c8c39f4d27453c794 /shells | |
| parent | eb9435da523bf8da94071088791ce4099699e409 (diff) | |
| download | ports-64bbb9428335856929fa7649f702a137d867693e.tar.gz ports-64bbb9428335856929fa7649f702a137d867693e.zip | |
- Use MAKE_ARGS
- Don't invoke install-info twice when using INFO
Notes
Notes:
svn path=/head/; revision=134155
Diffstat (limited to 'shells')
| -rw-r--r-- | shells/esh/Makefile | 2 | ||||
| -rw-r--r-- | shells/esh/files/patch-aa | 21 |
2 files changed, 1 insertions, 22 deletions
diff --git a/shells/esh/Makefile b/shells/esh/Makefile index d98409149568..7260348516a7 100644 --- a/shells/esh/Makefile +++ b/shells/esh/Makefile @@ -15,6 +15,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= The "easy shell", a small shell with Lisp-like syntax WRKSRC= ${WRKDIR}/esh +MAKE_ARGS= CC="${CC}" CFLAGS="${CFLAGS} -I/usr/include/readline" INFO= esh pre-build: @@ -29,7 +30,6 @@ do-install: @${RM} /etc/shells.bak .if !defined(NOPORTDOCS) ${INSTALL_DATA} ${WRKSRC}/doc/esh.info ${PREFIX}/info/esh.info - install-info ${PREFIX}/info/esh.info ${PREFIX}/info/dir .endif .include <bsd.port.mk> diff --git a/shells/esh/files/patch-aa b/shells/esh/files/patch-aa deleted file mode 100644 index 929c57246373..000000000000 --- a/shells/esh/files/patch-aa +++ /dev/null @@ -1,21 +0,0 @@ ---- Makefile.orig Wed Feb 6 16:23:28 2002 -+++ Makefile Wed Feb 6 16:23:51 2002 -@@ -1,7 +1,7 @@ - - # Your C compiler. - --CC=gcc -+#CC=gcc - - # Where your readline library is. - # You can compile with a "gets()" replacement instead. -@@ -19,7 +19,8 @@ - # -DMEM_DEBUG Check for memory leaks. - # - --CFLAGS=-g -Wall -DMEM_DEBUG $(INC) -+#CFLAGS=-g -Wall -DMEM_DEBUG $(INC) -+CFLAGS+= $(INC) - - # No need to change this stuff. - |