[Midnightbsd-cvs] src: usr.bin/pcc: install pcc into /usr/bin and /usr/libexec now.
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Wed Jun 25 15:33:26 EDT 2008
Log Message:
-----------
install pcc into /usr/bin and /usr/libexec now. Do not install man pages as they conflict with gcc. programs: pcc, pccom, pcpp
Tags:
----
RELENG_0_2
Modified Files:
--------------
src/usr.bin/pcc:
Makefile.inc (r1.2 -> r1.2.2.1)
config.h (r1.2 -> r1.2.2.1)
src/usr.bin/pcc/cc:
Makefile (r1.5 -> r1.5.2.1)
cc.c (r1.1 -> r1.1.2.1)
src/usr.bin/pcc/ccom:
Makefile.inc (r1.5 -> r1.5.2.1)
main.c (r1.1 -> r1.1.2.1)
src/usr.bin/pcc/cpp:
Makefile (r1.5 -> r1.5.2.1)
cpp.c (r1.2 -> r1.2.2.1)
-------------- next part --------------
Index: cc.c
===================================================================
RCS file: /home/cvs/src/usr.bin/pcc/cc/cc.c,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -L usr.bin/pcc/cc/cc.c -L usr.bin/pcc/cc/cc.c -u -r1.1 -r1.1.2.1
--- usr.bin/pcc/cc/cc.c
+++ usr.bin/pcc/cc/cc.c
@@ -122,8 +122,8 @@
int onlyas;
int pthreads;
-char *pass0 = LIBEXECDIR "/ccom";
-char *passp = LIBEXECDIR "/cpp";
+char *pass0 = LIBEXECDIR "/pccom";
+char *passp = LIBEXECDIR "/pcpp";
char *Bflag;
char *cppadd[] = CPPADD;
char *dynlinker[] = DYNLINKER;
@@ -420,7 +420,7 @@
*/
com:
na = 0;
- av[na++]= "ccom";
+ av[na++]= "pccom";
if (vflag)
av[na++] = "-v";
if (gflag)
Index: Makefile
===================================================================
RCS file: /home/cvs/src/usr.bin/pcc/cc/Makefile,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -L usr.bin/pcc/cc/Makefile -L usr.bin/pcc/cc/Makefile -u -r1.5 -r1.5.2.1
--- usr.bin/pcc/cc/Makefile
+++ usr.bin/pcc/cc/Makefile
@@ -11,8 +11,8 @@
BINDIR= /usr/local/bin
MANDIR= /usr/local/man/man
-MAN= cc.1
-#NO_MAN=
-MLINKS+= cc.1 pcc.1
+#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.5
retrieving revision 1.5.2.1
diff -L usr.bin/pcc/ccom/Makefile.inc -L usr.bin/pcc/ccom/Makefile.inc -u -r1.5 -r1.5.2.1
--- usr.bin/pcc/ccom/Makefile.inc
+++ usr.bin/pcc/ccom/Makefile.inc
@@ -4,10 +4,11 @@
# Makefile for the ccom part of pcc.
#
-PROG= ccom
+PROG= pccom
#PROG= ccom_${TARGMACH}
-MAN= ccom.1
-MANDIR= /usr/local/man/man
+#MAN= ccom.1
+#MANDIR= /usr/local/man/man
+NO_MAN=
BINDIR= ${libexecdir}
TARGOS= midnightbsd
CLEANFILES= external.h external.c mkext
Index: main.c
===================================================================
RCS file: /home/cvs/src/usr.bin/pcc/ccom/main.c,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -L usr.bin/pcc/ccom/main.c -L usr.bin/pcc/ccom/main.c -u -r1.1 -r1.1.2.1
--- usr.bin/pcc/ccom/main.c
+++ usr.bin/pcc/ccom/main.c
@@ -220,7 +220,7 @@
usage();
break;
case 'v':
- printf("ccom: %s\n", VERSSTR);
+ printf("pccom: %s\n", VERSSTR);
break;
case '?':
Index: Makefile.inc
===================================================================
RCS file: /home/cvs/src/usr.bin/pcc/Makefile.inc,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -L usr.bin/pcc/Makefile.inc -L usr.bin/pcc/Makefile.inc -u -r1.2 -r1.2.2.1
--- usr.bin/pcc/Makefile.inc
+++ usr.bin/pcc/Makefile.inc
@@ -1,4 +1,4 @@
# $MidnightBSD$
-libexecdir= ${DESTDIR}/usr/local/libexec
-includedir= ${DESTDIR}/usr/local/include
+libexecdir= ${DESTDIR}/usr/libexec
+includedir= ${DESTDIR}/usr/include
Index: config.h
===================================================================
RCS file: /home/cvs/src/usr.bin/pcc/config.h,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -L usr.bin/pcc/config.h -L usr.bin/pcc/config.h -u -r1.2 -r1.2.2.1
--- usr.bin/pcc/config.h
+++ usr.bin/pcc/config.h
@@ -49,9 +49,11 @@
/* Define to 1 if you have the `strchr' function. */
/* #undef HAVE_STRCHR */
+#define HAVE_STRCHR 1
/* Define to 1 if you have the `strdup' function. */
/* #undef HAVE_STRDUP */
+#define HAVE_STRDUP 1
/* Define to 1 if you have the <strings.h> header file. */
#define HAVE_STRINGS_H 1
@@ -61,9 +63,11 @@
/* Define to 1 if you have the `strrchr' function. */
/* #undef HAVE_STRRCHR */
+#define HAVE_STRRCHR 1
/* Define to 1 if you have the `strtol' function. */
/* #undef HAVE_STRTOL */
+#define HAVE_STRTOL 1
/* Define to 1 if you have the <sys/stat.h> header file. */
#define HAVE_SYS_STAT_H 1
@@ -79,12 +83,14 @@
/* Define to 1 if you have the `vfork' function. */
/* #undef HAVE_VFORK */
+#define HAVE_VFORK 1
/* Define to 1 if you have the <vfork.h> header file. */
/* #undef HAVE_VFORK_H */
/* Define to 1 if you have the `vprintf' function. */
/* #undef HAVE_VPRINTF */
+#define HAVE_VPRINTF 1
/* Define to 1 if `fork' works. */
/* #undef HAVE_WORKING_FORK */
Index: cpp.c
===================================================================
RCS file: /home/cvs/src/usr.bin/pcc/cpp/cpp.c,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -L usr.bin/pcc/cpp/cpp.c -L usr.bin/pcc/cpp/cpp.c -u -r1.2 -r1.2.2.1
--- usr.bin/pcc/cpp/cpp.c
+++ usr.bin/pcc/cpp/cpp.c
@@ -219,7 +219,7 @@
break;
#endif
case 'v':
- printf("cpp: %s\n", VERSSTR);
+ printf("pcpp: %s\n", VERSSTR);
break;
case 'd':
if (optarg[0] == 'M') {
Index: Makefile
===================================================================
RCS file: /home/cvs/src/usr.bin/pcc/cpp/Makefile,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -L usr.bin/pcc/cpp/Makefile -L usr.bin/pcc/cpp/Makefile -u -r1.5 -r1.5.2.1
--- usr.bin/pcc/cpp/Makefile
+++ usr.bin/pcc/cpp/Makefile
@@ -2,11 +2,12 @@
.include <bsd.own.mk>
-PROG= cpp
+PROG= pcpp
TARGOS= midnightbsd
BINDIR= ${libexecdir}
-#NO_MAN=
-MANDIR= /usr/local/man/man
+NO_MAN=
+#MAN= cpp.1
+#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