[Midnightbsd-cvs] src: usr.bin/pcc: Duh.
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Thu May 15 01:55:32 EDT 2008
Log Message:
-----------
Duh. Switch back to /usr/local as cpp will conflict with gcc.
We might need to hack this and/or make a wrapper for the system compiler if we want to connect this to the build.
This is a rare case where we're writing to /usr/local and it's not a port. (maybe the only time) i don't like this one bit.
Modified Files:
--------------
src/usr.bin/pcc:
Makefile.inc (r1.1 -> r1.2)
src/usr.bin/pcc/cc:
Makefile (r1.4 -> r1.5)
src/usr.bin/pcc/ccom:
Makefile.inc (r1.3 -> r1.4)
src/usr.bin/pcc/cpp:
Makefile (r1.4 -> r1.5)
-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /home/cvs/src/usr.bin/pcc/cc/Makefile,v
retrieving revision 1.4
retrieving revision 1.5
diff -L usr.bin/pcc/cc/Makefile -L usr.bin/pcc/cc/Makefile -u -r1.4 -r1.5
--- usr.bin/pcc/cc/Makefile
+++ usr.bin/pcc/cc/Makefile
@@ -9,9 +9,10 @@
CFLAGS+= -I${.CURDIR}/..
CFLAGS+= -Dmach_${TARGMACH} -Dos_${TARGOS}
-BINDIR= /usr/bin
-#MAN= cc.1
-NO_MAN=
-#MLINKS+= cc.1 pcc.1
+BINDIR= /usr/local/bin
+MANDIR= /usr/local/man/man
+MAN= cc.1
+#NO_MAN=
+MLINKS+= cc.1 pcc.1
.include <bsd.prog.mk>
Index: Makefile.inc
===================================================================
RCS file: /home/cvs/src/usr.bin/pcc/ccom/Makefile.inc,v
retrieving revision 1.3
retrieving revision 1.4
diff -L usr.bin/pcc/ccom/Makefile.inc -L usr.bin/pcc/ccom/Makefile.inc -u -r1.3 -r1.4
--- usr.bin/pcc/ccom/Makefile.inc
+++ usr.bin/pcc/ccom/Makefile.inc
@@ -6,6 +6,7 @@
PROG= ccom_${TARGMACH}
MAN= ccom.1
+MANDIR= /usr/local/man/man
BINDIR= ${libexecdir}
TARGOS= midnightbsd
CLEANFILES= external.h external.c mkext
Index: Makefile.inc
===================================================================
RCS file: /home/cvs/src/usr.bin/pcc/Makefile.inc,v
retrieving revision 1.1
retrieving revision 1.2
diff -L usr.bin/pcc/Makefile.inc -L usr.bin/pcc/Makefile.inc -u -r1.1 -r1.2
--- usr.bin/pcc/Makefile.inc
+++ usr.bin/pcc/Makefile.inc
@@ -1,4 +1,4 @@
# $MidnightBSD$
-libexecdir= ${DESTDIR}/usr/libexec
-includedir= ${DESTDIR}/usr/include
+libexecdir= ${DESTDIR}/usr/local/libexec
+includedir= ${DESTDIR}/usr/local/include
Index: Makefile
===================================================================
RCS file: /home/cvs/src/usr.bin/pcc/cpp/Makefile,v
retrieving revision 1.4
retrieving revision 1.5
diff -L usr.bin/pcc/cpp/Makefile -L usr.bin/pcc/cpp/Makefile -u -r1.4 -r1.5
--- usr.bin/pcc/cpp/Makefile
+++ usr.bin/pcc/cpp/Makefile
@@ -5,7 +5,8 @@
PROG= cpp
TARGOS= midnightbsd
BINDIR= ${libexecdir}
-NO_MAN=
+#NO_MAN=
+MANDIR= /usr/local/man/man
CFLAGS+= -DCPP_DEBUG -Wall -Wmissing-prototypes -Wstrict-prototypes -Werror
CFLAGS+= -DLIBEXECDIR=\"${libexecdir}\"
More information about the Midnightbsd-cvs
mailing list