[Midnightbsd-cvs] src: usr.bin/pcc: apply the DESTDIR= patch to CURRENT which fixes making

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Thu Jul 3 19:57:49 EDT 2008


Log Message:
-----------
apply the DESTDIR= patch to CURRENT which fixes making live cds

Modified Files:
--------------
    src/usr.bin/pcc:
        Makefile.inc (r1.3 -> r1.4)
    src/usr.bin/pcc/cc:
        Makefile (r1.7 -> r1.8)
    src/usr.bin/pcc/ccom:
        Makefile (r1.1 -> r1.2)
    src/usr.bin/pcc/f77:
        Makefile (r1.1 -> r1.2)

-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /home/cvs/src/usr.bin/pcc/cc/Makefile,v
retrieving revision 1.7
retrieving revision 1.8
diff -L usr.bin/pcc/cc/Makefile -L usr.bin/pcc/cc/Makefile -u -r1.7 -r1.8
--- usr.bin/pcc/cc/Makefile
+++ usr.bin/pcc/cc/Makefile
@@ -5,7 +5,7 @@
 TARGOS=	midnightbsd
 TARGMACH=	${MACHINE_ARCH}
 
-CFLAGS+=	-DLIBEXECDIR=\"${libexecdir}\"
+CFLAGS+=	-DLIBEXECDIR=\"/usr/libexec\"
 CFLAGS+=	-I${.CURDIR}/..
 CFLAGS+=	-Dmach_${TARGMACH} -Dos_${TARGOS}
 
Index: Makefile.inc
===================================================================
RCS file: /home/cvs/src/usr.bin/pcc/Makefile.inc,v
retrieving revision 1.3
retrieving revision 1.4
diff -L usr.bin/pcc/Makefile.inc -L usr.bin/pcc/Makefile.inc -u -r1.3 -r1.4
--- usr.bin/pcc/Makefile.inc
+++ usr.bin/pcc/Makefile.inc
@@ -1,4 +1,4 @@
 # $MidnightBSD$
 
-libexecdir= ${DESTDIR}/usr/libexec
-includedir= ${DESTDIR}/usr/include
+libexecdir= /usr/libexec
+includedir= /usr/include
Index: Makefile
===================================================================
RCS file: /home/cvs/src/usr.bin/pcc/ccom/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -L usr.bin/pcc/ccom/Makefile -L usr.bin/pcc/ccom/Makefile -u -r1.1 -r1.2
--- usr.bin/pcc/ccom/Makefile
+++ usr.bin/pcc/ccom/Makefile
@@ -1,5 +1,48 @@
 # $MidnightBSD$
+#	$OpenBSD: Makefile.inc,v 1.3 2007/10/15 01:05:25 deraadt Exp $
+#
+# Makefile for the ccom part of pcc.
+#
 
-SUBDIR+=	${MACHINE_ARCH}
+PROG=		pccom
+NO_MAN=
+BINDIR=		/usr/libexec
+TARGOS=		midnightbsd
+CLEANFILES=	external.h external.c mkext
+TARGMACH=       ${MACHINE_ARCH}
 
-.include <bsd.subdir.mk>
+CFLAGS+=        -Dmach_${TARGMACH}
+CFLAGS+=	-DPCC_DEBUG -DGCC_COMPAT
+CFLAGS+=	-Wall -Wmissing-prototypes -Wstrict-prototypes -Werror
+CFLAGS+=	-I. -I${.CURDIR}/.. -I${.CURDIR} -I${.CURDIR}/../mip
+CFLAGS+=	-I${.CURDIR}/../${TARGMACH}
+
+.PATH:	${.CURDIR}/../${TARGMACH}
+.PATH:	${.CURDIR}/../mip
+.PATH:	${.CURDIR}
+
+SRCS=optim.c pftn.c scan.l pass2.h trees.c cgram.y inline.c symtabs.c \
+	gcc_compat.c init.c local.c code.c stabs.c match.c reader.c optim2.c \
+	regs.c local2.c order.c table.c common.c main.c external.c
+
+cgram.c: cgram.y
+	$(YACC) $(YFLAGS) -d $<
+	mv y.tab.c cgram.c
+	mv y.tab.h cgram.h
+
+pass2.h: external.h
+
+optim2.o reader.o: external.h
+
+external.h external.c: mkext.c table.c common.c
+	$(CC) $(CPPFLAGS) $(CFLAGS) -DMKEXT -o mkext \
+	    ${.CURDIR}/../mip/mkext.c ${.CURDIR}/../${TARGMACH}/table.c \
+	    ${.CURDIR}/../mip/common.c
+	./mkext
+
+pftn.o: cgram.c
+
+cleandepend:
+	rm -f .depend ${.CURDIR}/tags cgram.h
+
+.include <bsd.prog.mk>
Index: Makefile
===================================================================
RCS file: /home/cvs/src/usr.bin/pcc/f77/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -L usr.bin/pcc/f77/Makefile -L usr.bin/pcc/f77/Makefile -u -r1.1 -r1.2
--- usr.bin/pcc/f77/Makefile
+++ usr.bin/pcc/f77/Makefile
@@ -1,6 +1,5 @@
 #	$Id: Makefile.in,v 1.1 2005/05/14 11:22:00 ragge Exp $
-#
-# Makefile.in for top-level of pcc.
+# $MidnightBSD$
 #
 
 


More information about the Midnightbsd-cvs mailing list