summaryrefslogtreecommitdiff
path: root/lang
diff options
context:
space:
mode:
authorTrevor Johnson <trevor@FreeBSD.org>2004-03-15 21:48:02 +0000
committerTrevor Johnson <trevor@FreeBSD.org>2004-03-15 21:48:02 +0000
commitde1abc66a21bf92429280db23f1f8d84ff61f784 (patch)
treeba31c01da8b68d127f2d27ae6ad432e31caa2483 /lang
parentFill /mnt/ before each port and clear it afterward, to avoid running (diff)
Use INFO and TOUCH macros. Fix white space.
PR: 64193 Submitted by: Yen-Ming Lee
Notes
Notes: svn path=/head/; revision=104117
Diffstat (limited to 'lang')
-rw-r--r--lang/gcc295/Makefile11
-rw-r--r--lang/gcc295/pkg-plist6
2 files changed, 6 insertions, 11 deletions
diff --git a/lang/gcc295/Makefile b/lang/gcc295/Makefile
index c2582774d87f..c4dede00e6a6 100644
--- a/lang/gcc295/Makefile
+++ b/lang/gcc295/Makefile
@@ -51,13 +51,14 @@ CONFIGURE_ARGS= --with-gnu-as --with-gnu-ld \
#CONFIGURE_ARGS+= --program-suffix=-295
CONFIGURE_ENV= MAKEINFO="makeinfo --no-split"
.if defined(WANT_SHAREDLIBS)
-CONFIGURE_ARGS+= --enable-shared
+CONFIGURE_ARGS+= --enable-shared
.endif
.if defined(WANT_THREADS)
# ?is this an ObjC only thing?
-CONFIGURE_ARGS+= --enable-threads=posix
+CONFIGURE_ARGS+= --enable-threads=posix
.endif
ALL_TARGET= bootstrap
+INFO= gcc cpp
MAN1= cccp.1 g++295.1 gcc295.1
pre-patch:
@@ -76,8 +77,8 @@ pre-configure:
@${CP} ${FILESDIR}/alpha-freebsd.h ${WRKSRC}/gcc/config/alpha/freebsd.h
@# Keep from running `autoconf' and `autoheader' since we modified
@# configure.in by patching it.
- @touch ${WRKSRC}/gcc/configure
- @touch ${WRKSRC}/gcc/cstamp-h.in
+ @${TOUCH} ${WRKSRC}/gcc/configure
+ @${TOUCH} ${WRKSRC}/gcc/cstamp-h.in
pre-install:
${MKDIR} ${PREFIX}/info
@@ -109,7 +110,7 @@ post-install:
.if defined(WANT_SHAREDLIBS)
${MV} -f ${PREFIX}/lib/libstdc++.so* ${TARGLIB}
.endif
-.for info in cpp gcc
+.for info in ${INFO}
install-info ${PREFIX}/info/${info}.info ${PREFIX}/info/dir
.endfor
cd ${PREFIX} ;\
diff --git a/lang/gcc295/pkg-plist b/lang/gcc295/pkg-plist
index 0c26ea95cc03..929374b94b7d 100644
--- a/lang/gcc295/pkg-plist
+++ b/lang/gcc295/pkg-plist
@@ -10,12 +10,6 @@ bin/unprotoize295
@comment Insert PLIST.gcc-lib here
@comment -=[ begin PLIST.gcc-lib ]=-
@comment -=[ end PLIST.gcc-lib ]=-
-@unexec install-info --delete %D/info/gcc.info %D/info/dir
-@unexec install-info --delete %D/info/cpp.info %D/info/dir
-info/cpp.info
-info/gcc.info
-@exec install-info %D/info/cpp.info %D/info/dir
-@exec install-info %D/info/gcc.info %D/info/dir
@dirrm %%GNU_HOST%%/include
@dirrm %%GNU_HOST%%
@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/std