[Midnightbsd-cvs] src: usr.bin/pcc: Add Makefile.inc to define the libexec path we're
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Thu May 15 01:38:37 EDT 2008
Log Message:
-----------
Add Makefile.inc to define the libexec path we're using.
Disable the man page for pcc for now. I've moved the install path to /usr/bin and /usr/libexec for the files and cc.1 obviously conflicts with gcc's manpage. (actually i need to check on cpp's manpage)
Modified Files:
--------------
src/usr.bin/pcc/cc:
Makefile (r1.3 -> r1.4)
src/usr.bin/pcc/ccom:
Makefile.inc (r1.2 -> r1.3)
src/usr.bin/pcc/cpp:
Makefile (r1.2 -> r1.3)
Added Files:
-----------
src/usr.bin/pcc:
Makefile.inc (r1.1)
-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /home/cvs/src/usr.bin/pcc/cc/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -L usr.bin/pcc/cc/Makefile -L usr.bin/pcc/cc/Makefile -u -r1.3 -r1.4
--- usr.bin/pcc/cc/Makefile
+++ usr.bin/pcc/cc/Makefile
@@ -1,16 +1,17 @@
# $MidnightBSD$
-PROG= cc
-PREFIX= /usr/local
-BINDIR= ${PREFIX}/bin
-MANDIR= ${PREFIX}/man/man
+PROG= pcc
+SRCS= cc.c
TARGOS= midnightbsd
TARGMACH= ${MACHINE_ARCH}
-CFLAGS+= -DLIBEXECDIR=\"${PREFIX}\"
+CFLAGS+= -DLIBEXECDIR=\"${libexecdir}\"
CFLAGS+= -I${.CURDIR}/..
CFLAGS+= -Dmach_${TARGMACH} -Dos_${TARGOS}
-MLINKS+= cc.1 pcc.1
+BINDIR= /usr/bin
+#MAN= cc.1
+NO_MAN=
+#MLINKS+= cc.1 pcc.1
.include <bsd.prog.mk>
--- /dev/null
+++ usr.bin/pcc/Makefile.inc
@@ -0,0 +1,4 @@
+# $MidnightBSD: src/usr.bin/pcc/Makefile.inc,v 1.1 2008/05/15 05:38:35 laffer1 Exp $
+
+libexecdir= ${DESTDIR}/usr/libexec
+includedir= ${DESTDIR}/usr/include
Index: Makefile.inc
===================================================================
RCS file: /home/cvs/src/usr.bin/pcc/ccom/Makefile.inc,v
retrieving revision 1.2
retrieving revision 1.3
diff -L usr.bin/pcc/ccom/Makefile.inc -L usr.bin/pcc/ccom/Makefile.inc -u -r1.2 -r1.3
--- usr.bin/pcc/ccom/Makefile.inc
+++ usr.bin/pcc/ccom/Makefile.inc
@@ -6,16 +6,13 @@
PROG= ccom_${TARGMACH}
MAN= ccom.1
-
-PREFIX= /usr/local
-BINDIR= ${PREFIX}/libexec
-MANDIR= ${PREFIX}/man/man
+BINDIR= ${libexecdir}
TARGOS= midnightbsd
CLEANFILES= external.h external.c mkext
CFLAGS+= -DPCC_DEBUG -DGCC_COMPAT
CFLAGS+= -Wall -Wmissing-prototypes -Wstrict-prototypes -Werror
-CFLAGS+= -DLIBEXECDIR=\"${PREFIX}/libexec\"
+CFLAGS+= -DLIBEXECDIR=\"${libexecdir}\"
CFLAGS+= -I. -I${.CURDIR}/.. -I${.CURDIR} -I${.CURDIR}/../../mip
CFLAGS+= -I${.CURDIR}/../../${TARGMACH}
CFLAGS+= -I${.CURDIR}/../..
@@ -47,3 +44,7 @@
cleandepend:
rm -f .depend ${.CURDIR}/tags cgram.h
+
+.if exists(${.CURDIR}/../../Makefile.inc)
+.include "${.CURDIR}/../../Makefile.inc"
+.endif
Index: Makefile
===================================================================
RCS file: /home/cvs/src/usr.bin/pcc/cpp/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -L usr.bin/pcc/cpp/Makefile -L usr.bin/pcc/cpp/Makefile -u -r1.2 -r1.3
--- usr.bin/pcc/cpp/Makefile
+++ usr.bin/pcc/cpp/Makefile
@@ -1,15 +1,21 @@
# $MidnightBSD$
+.include <bsd.own.mk>
+
PROG= cpp
-PREFIX= /usr/local
-BINDIR= ${PREFIX}/libexec
-MANDIR= ${PREFIX}/man/man
TARGOS= midnightbsd
+BINDIR= ${libexecdir}
CFLAGS+= -DCPP_DEBUG -Wall -Wmissing-prototypes -Wstrict-prototypes -Werror
-CFLAGS+= -DLIBEXECDIR=\"${PREFIX}/libexec\"
+CFLAGS+= -DLIBEXECDIR=\"${libexecdir}\"
CFLAGS+= -I. -I${.CURDIR}
-YFLAGS= -d
SRCS= cpy.y scanner.l cpp.c
+CLEANFILES+= y.tab.c y.tab.h
+
+#scanner.l expects y.tab.h
+cpy.c: cpy.y
+ ${YACC} ${YFLAGS} -o ${.TARGET} ${.ALLSRC}
+ mv cpy.h y.tab.h
+
.include <bsd.prog.mk>
More information about the Midnightbsd-cvs
mailing list