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>
This commit is contained in:
obrien 2000-01-10 06:24:49 +00:00
parent cc0bf82857
commit 73a7c59e55
2 changed files with 6 additions and 5 deletions

View File

@ -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);
}

View File

@ -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"