aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--usr.bin/calendar/io.c4
-rw-r--r--usr.bin/calendar/pathnames.h7
2 files changed, 6 insertions, 5 deletions
diff --git a/usr.bin/calendar/io.c b/usr.bin/calendar/io.c
index 846b96ed5805..528c2ea27f0f 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 481989c0fb77..1bffe0131fee 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"