about summary refs log tree commit diff
diff options
context:
space:
mode:
authorLeah Neukirchen <leah@vuxu.org>2019-06-01 20:54:45 +0200
committerLeah Neukirchen <leah@vuxu.org>2019-06-01 20:54:45 +0200
commit4838441e614ec385b5eef284555b1f6bfed4aeae (patch)
treedd1e71a6b278d95bbf13534695a72a9505c78ee1
parent34a71527e28acaa4e34be42af0fe2333cefca79e (diff)
downloadoutils-4838441e614ec385b5eef284555b1f6bfed4aeae.tar.gz
outils-4838441e614ec385b5eef284555b1f6bfed4aeae.tar.xz
outils-4838441e614ec385b5eef284555b1f6bfed4aeae.zip
pass _PATH_INCLUDE from Makefile
Reported by Steffen Nurpmeso <steffen@sdaoden.eu>.
-rw-r--r--Makefile2
-rw-r--r--src/usr.bin/calendar/pathnames.h3
2 files changed, 1 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index 75ce70c..877d335 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 CFLAGS?=-Wall -O2
-CPPFLAGS=-include src/liboutils/outils.h -isystem src/liboutils/include -Isrc/bin/md5 -D_GNU_SOURCE -D_DEFAULT_SOURCE -DNO_UTIL
+CPPFLAGS=-include src/liboutils/outils.h -isystem src/liboutils/include -Isrc/bin/md5 -D_GNU_SOURCE -D_DEFAULT_SOURCE -DNO_UTIL -D_PATH_INCLUDE="\"$(PREFIX)/share/calendar\""
 LDFLAGS=-Wl,--as-needed
 LIBS=-lm
 
diff --git a/src/usr.bin/calendar/pathnames.h b/src/usr.bin/calendar/pathnames.h
index 0fb401c..60fe31c 100644
--- a/src/usr.bin/calendar/pathnames.h
+++ b/src/usr.bin/calendar/pathnames.h
@@ -34,6 +34,3 @@
 #include <paths.h>
 
 #define	_PATH_CPP	"/usr/bin/cpp"
-
-			/* XXX -- fix when cpp parses arguments rationally */
-#define	_PATH_INCLUDE	"-I/usr/share/calendar"