diff options
| author | obrien <obrien@FreeBSD.org> | 2000-01-10 06:24:49 +0000 |
|---|---|---|
| committer | obrien <obrien@FreeBSD.org> | 2000-01-10 06:24:49 +0000 |
| commit | d27a109dea3fabba58b098ae385f1949def0367f (patch) | |
| tree | e1ea3856af85f4931bc6ce8df1318e88fc334431 /usr.bin/calendar | |
| parent | ebe7c1ce236ce9f44832a1ec8371aeafcad6dc2e (diff) | |
| download | FreeBSD-src-d27a109dea3fabba58b098ae385f1949def0367f.zip FreeBSD-src-d27a109dea3fabba58b098ae385f1949def0367f.tar.gz | |
Adapt to the new `ccp' now that the traditional-behaving /usr/bin/cpp
script is gone.
PR: 15932
Submitted by: Jos Backus <Jos.Backus@nl.origin-it.com>
Tested by: brian, Manfred Antar <mantar@pacbell.net>
Diffstat (limited to 'usr.bin/calendar')
| -rw-r--r-- | usr.bin/calendar/io.c | 4 | ||||
| -rw-r--r-- | usr.bin/calendar/pathnames.h | 7 |
2 files changed, 6 insertions, 5 deletions
diff --git a/usr.bin/calendar/io.c b/usr.bin/calendar/io.c index 846b96e..528c2ea 100644 --- a/usr.bin/calendar/io.c +++ b/usr.bin/calendar/io.c @@ -274,7 +274,9 @@ opencal() warnx("setuid failed"); _exit(1); } - execl(_PATH_CPP, "cpp", "-P", "-I.", _PATH_INCLUDE, NULL); + execl(_PATH_CPP, "cpp", "-P", + "-traditional", "-nostdinc", /* GCC specific opts */ + "-I.", "-I", _PATH_INCLUDE, NULL); warn(_PATH_CPP); _exit(1); } diff --git a/usr.bin/calendar/pathnames.h b/usr.bin/calendar/pathnames.h index 481989c..1bffe01 100644 --- a/usr.bin/calendar/pathnames.h +++ b/usr.bin/calendar/pathnames.h @@ -31,11 +31,10 @@ * SUCH DAMAGE. * * @(#)pathnames.h 8.1 (Berkeley) 6/6/93 + * $FreeBSD$ */ #include <paths.h> -#define _PATH_CPP "/usr/bin/cpp" - - /* XXX -- fix when cpp parses arguments rationally */ -#define _PATH_INCLUDE "-I/usr/share/calendar" +#define _PATH_CPP "/usr/libexec/cpp" +#define _PATH_INCLUDE "/usr/share/calendar" |
