include/paths.h: merged

Change-Id: I5e2aa0bc99a596f82ef4224f22623bcb83cb98b5

diff --git a/commands/dhcpd/dhcpd.h b/commands/dhcpd/dhcpd.h
index 93bf5a89987c9a6f1ba85aa56d6503f178f2bfc6..4ec65b19f3fda290102a556b6416e25980edb9ef 100644 (file)
--- a/commands/dhcpd/dhcpd.h
+++ b/commands/dhcpd/dhcpd.h
@@ -5,7 +5,7 @@
 
 #define nil ((void*)0)
 
-#include <paths.h>
+#include <minix/paths.h>
 
 /* Paths to files. */
 #define PATH_DHCPCONF  _PATH_DHCPCONF

diff --git a/commands/hostaddr/hostaddr.c b/commands/hostaddr/hostaddr.c
index ddaf5d301ca2ff5281025e496150dc9a16dd6de1..18cc506bda093ebe75988e3bf67048e11f857a5d 100644 (file)
--- a/commands/hostaddr/hostaddr.c
+++ b/commands/hostaddr/hostaddr.c
@@ -32,7 +32,7 @@ Created:      Jan 27, 1992 by Philip Homburg
 #include <net/gen/resolv.h>
 #include <net/gen/dhcp.h>
 
-#include <paths.h>
+#include <minix/paths.h>
 
 char *prog_name;
 

diff --git a/commands/nonamed/nonamed.c b/commands/nonamed/nonamed.c
index 5760238c603d1da7be95e673b154051bd98c4f50..34362da616dff0c45684d410593da9237a07b915 100644 (file)
--- a/commands/nonamed/nonamed.c
+++ b/commands/nonamed/nonamed.c
@@ -44,6 +44,7 @@ static const char version[] = "2.7";
 #include <net/gen/dhcp.h>
 
 #include <paths.h>
+#include <minix/paths.h>
 
 #undef HTONL
 #undef HTONS

diff --git a/commands/ps/ps.c b/commands/ps/ps.c
index f5dbde8a9a3a314a75d580801045c935231fb417..98e32b89f1984e0674fb1207793534a6e90f51c0 100644 (file)
--- a/commands/ps/ps.c
+++ b/commands/ps/ps.c
@@ -41,7 +41,7 @@
 
 #include <minix/config.h>
 #include <minix/endpoint.h>
-#include <paths.h>
+#include <minix/paths.h>
 #include <minix/procfs.h>
 #include <limits.h>
 #include <sys/types.h>

diff --git a/commands/ramdisk/ramdisk.c b/commands/ramdisk/ramdisk.c
index 9fe0bb5a6d9c2a428da9d55404df39c0566f16a2..139baf2bc6d2654a38566bc8fb56c065b07c3e24 100644 (file)
--- a/commands/ramdisk/ramdisk.c
+++ b/commands/ramdisk/ramdisk.c
@@ -1,5 +1,5 @@
 
-#include <paths.h>
+#include <minix/paths.h>
 
 #include <sys/ioc_memory.h>
 #include <stdio.h>

diff --git a/commands/service/parse.c b/commands/service/parse.c
index 08ccd3fe1a0b176cdd3def2784fd79c4c0abc771..fe2433687db6c78ec6d741aaeffea263646987b9 100644 (file)
--- a/commands/service/parse.c
+++ b/commands/service/parse.c
@@ -18,7 +18,7 @@
 #include <minix/rs.h>
 #include <minix/syslib.h>
 #include <minix/bitmap.h>
-#include <paths.h>
+#include <minix/paths.h>
 #include <minix/sef.h>
 #include <minix/dmap.h>
 #include <sys/types.h>

diff --git a/commands/service/service.c b/commands/service/service.c
index cdfc86cdaa74cec49a7f808d347005eda41ebaf4..e8c965a0b1eaf0ea98b50b3474b746483b6b1379 100644 (file)
--- a/commands/service/service.c
+++ b/commands/service/service.c
@@ -24,7 +24,7 @@
 #include <minix/rs.h>
 #include <minix/syslib.h>
 #include <minix/bitmap.h>
-#include <paths.h>
+#include <minix/paths.h>
 #include <minix/sef.h>
 #include <minix/dmap.h>
 #include <sys/types.h>

diff --git a/include/minix/paths.h b/include/minix/paths.h
index 447c465afad3cec833047495a3cf142ca48c5a05..195d80f62aec4218c981aeecd84890842f455995 100644 (file)
--- a/include/minix/paths.h
+++ b/include/minix/paths.h
@@ -13,8 +13,6 @@
 #define _PATH_DHCPCACHE        "/usr/adm/dhcp.cache"
 #define _PATH_DHCPPOOL "/usr/adm/dhcp.pool"
 
-#define _PATH_MOTD     "/etc/motd"
-
 #define _PATH_RAMDISK  "/dev/ram"
 
 #define _PATH_DRIVERS  "/usr/sbin"

diff --git a/include/paths.h b/include/paths.h
index 2cf6711e6e5b2c7584b36bd1f4161ead24228911..82f2ae532224e70df7cb4417d6b10ca9d36a0d68 100644 (file)
--- a/include/paths.h
+++ b/include/paths.h
@@ -126,9 +126,5 @@
 #define        _PATH_VI        "/usr/bin/vi"
 #endif
 
-#ifdef __minix
-#include <minix/paths.h>
-#endif /* !__minix */
-
 #endif /* !_PATHS_H_ */
 

diff --git a/lib/libc/gen/minix/getloadavg.c b/lib/libc/gen/minix/getloadavg.c
index 33c2c46db55521629ba26933c91e6ca2af68d7d0..af2cf5cac7e184742e2b0a5fcacfe431c6371a0e 100644 (file)
--- a/lib/libc/gen/minix/getloadavg.c
+++ b/lib/libc/gen/minix/getloadavg.c
@@ -2,7 +2,7 @@
 #include "namespace.h"
 
 #include <sys/types.h>
-#include <paths.h>
+#include <minix/paths.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <unistd.h>

diff --git a/lib/libc/gen/minix/sysconf.c b/lib/libc/gen/minix/sysconf.c
index 3a1e6fd24a114e7f92bb47b4a25bf8516d44e139..a740b3b7a877f32a166325c634b2c1355fb86f1f 100644 (file)
--- a/lib/libc/gen/minix/sysconf.c
+++ b/lib/libc/gen/minix/sysconf.c
@@ -13,7 +13,7 @@
 #include <unistd.h>
 #include <time.h>
 #include <stdio.h>
-#include <paths.h>
+#include <minix/paths.h>
 
 #ifdef __weak_alias
 __weak_alias(sysconf, __sysconf)

diff --git a/lib/libc/sys-minix/mount.c b/lib/libc/sys-minix/mount.c
index 1224e27177ca021b4cf1a01e851e892240f16b6d..c5f2006c7368071fbf0dd50e01128f2003c48cc8 100644 (file)
--- a/lib/libc/sys-minix/mount.c
+++ b/lib/libc/sys-minix/mount.c
@@ -7,9 +7,9 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <sys/stat.h>
-#include <minix/syslib.h>
+#include <minix/paths.h>
 #include <minix/rs.h>
-#include <paths.h>
+#include <minix/syslib.h>
 #include <unistd.h>
 #define OK     0
 

diff --git a/usr.bin/top/top.c b/usr.bin/top/top.c
index 14fda34fef7f0883db8caaaa24ad03312988229b..a83a3cc3a6ce8f07f60a920f62ef65a46906312b 100644 (file)
--- a/usr.bin/top/top.c
+++ b/usr.bin/top/top.c
@@ -31,7 +31,7 @@
 #include <minix/endpoint.h>
 #include <minix/const.h>
 #include <minix/u64.h>
-#include <paths.h>
+#include <minix/paths.h>
 #include <minix/procfs.h>
 
 #define TIMECYCLEKEY 't'

diff --git a/usr.sbin/vnconfig/vnconfig.c b/usr.sbin/vnconfig/vnconfig.c
index e95f6d2a45d6ee5f765bf2ee307d0627974a1b8d..0afc56db7c496d19a6840d48a31b2f4ed4cc0ded 100644 (file)
--- a/usr.sbin/vnconfig/vnconfig.c
+++ b/usr.sbin/vnconfig/vnconfig.c
@@ -76,6 +76,7 @@
 #include <sys/disk.h>
 #include <sys/bitops.h>
 #else
+#include <minix/paths.h>
 #include <sys/wait.h>
 #endif