Adapts for fhs and usrmove.

Signed-off-by: Thomas Backlund <tmb@mageia.org>

 sysdeps/generic/paths.h         |   16 ++++++++--------
 sysdeps/unix/sysv/linux/paths.h |   12 ++++++------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff -Nurp glibc-2.17/sysdeps/generic/paths.h glibc-2.17.fhs/sysdeps/generic/paths.h
--- glibc-2.17/sysdeps/generic/paths.h	2012-12-25 05:02:13.000000000 +0200
+++ glibc-2.17.fhs/sysdeps/generic/paths.h	2013-01-09 19:24:02.051595626 +0200
@@ -38,10 +38,10 @@
 #define	_PATH_STDPATH \
 	"/usr/bin:/bin:/usr/sbin:/sbin"
 
-#define	_PATH_BSHELL	"/bin/sh"
+#define	_PATH_BSHELL	"/usr/bin/sh"
 #define	_PATH_CONSOLE	"/dev/console"
-#define	_PATH_CSHELL	"/bin/csh"
-#define	_PATH_DEVDB	"/var/run/dev.db"
+#define	_PATH_CSHELL	"/usr/bin/csh"
+#define	_PATH_DEVDB	"/run/dev.db"
 #define	_PATH_DEVNULL	"/dev/null"
 #define	_PATH_DRUM	"/dev/drum"
 #define	_PATH_GSHADOW	"/etc/gshadow"
@@ -51,7 +51,7 @@
 #define	_PATH_MAN	"/usr/share/man"
 #define	_PATH_MEM	"/dev/mem"
 #define	_PATH_MNTTAB	"/etc/fstab"
-#define	_PATH_MOUNTED	"/var/run/mtab"
+#define	_PATH_MOUNTED	"/run/mtab"
 #define	_PATH_NOLOGIN	"/etc/nologin"
 #define	_PATH_PRESERVE	"/var/lib"
 #define	_PATH_RWHODIR	"/var/spool/rwho"
@@ -60,16 +60,16 @@
 #define	_PATH_SHELLS	"/etc/shells"
 #define	_PATH_TTY	"/dev/tty"
 #define	_PATH_UNIX	"/vmunix"
-#define	_PATH_UTMP	"/var/run/utmp"
-#define	_PATH_UTMP_DB	"/var/run/utmp.db"
+#define	_PATH_UTMP	"/run/utmp"
+#define	_PATH_UTMP_DB	"/run/utmp.db"
 #define	_PATH_VI	"/usr/bin/vi"
 #define	_PATH_WTMP	"/var/log/wtmp"
 
 /* Provide trailing slash, since mostly used for building pathnames. */
 #define	_PATH_DEV	"/dev/"
 #define	_PATH_TMP	"/tmp/"
-#define	_PATH_VARDB	"/var/db/"
-#define	_PATH_VARRUN	"/var/run/"
+#define	_PATH_VARDB	"/var/lib/misc/"
+#define	_PATH_VARRUN	"/run/"
 #define	_PATH_VARTMP	"/var/tmp/"
 
 #endif /* !_PATHS_H_ */
diff -Nurp glibc-2.17/sysdeps/unix/sysv/linux/paths.h glibc-2.17.fhs/sysdeps/unix/sysv/linux/paths.h
--- glibc-2.17/sysdeps/unix/sysv/linux/paths.h	2012-12-25 05:02:13.000000000 +0200
+++ glibc-2.17.fhs/sysdeps/unix/sysv/linux/paths.h	2013-01-09 19:24:02.052595595 +0200
@@ -38,10 +38,10 @@
 #define	_PATH_STDPATH \
 	"/usr/bin:/bin:/usr/sbin:/sbin"
 
-#define	_PATH_BSHELL	"/bin/sh"
+#define	_PATH_BSHELL	"/usr/bin/sh"
 #define	_PATH_CONSOLE	"/dev/console"
-#define	_PATH_CSHELL	"/bin/csh"
-#define	_PATH_DEVDB	"/var/run/dev.db"
+#define	_PATH_CSHELL	"/usr/bin/csh"
+#define	_PATH_DEVDB	"/run/dev.db"
 #define	_PATH_DEVNULL	"/dev/null"
 #define	_PATH_DRUM	"/dev/drum"
 #define	_PATH_GSHADOW	"/etc/gshadow"
@@ -61,15 +61,15 @@
 #define	_PATH_SHELLS	"/etc/shells"
 #define	_PATH_TTY	"/dev/tty"
 #define	_PATH_UNIX	"/boot/vmlinux"
-#define	_PATH_UTMP	"/var/run/utmp"
+#define	_PATH_UTMP	"/run/utmp"
 #define	_PATH_VI	"/usr/bin/vi"
 #define	_PATH_WTMP	"/var/log/wtmp"
 
 /* Provide trailing slash, since mostly used for building pathnames. */
 #define	_PATH_DEV	"/dev/"
 #define	_PATH_TMP	"/tmp/"
-#define	_PATH_VARDB	"/var/db/"
-#define	_PATH_VARRUN	"/var/run/"
+#define	_PATH_VARDB	"/var/lib/misc/"
+#define	_PATH_VARRUN	"/run/"
 #define	_PATH_VARTMP	"/var/tmp/"
 
 #endif /* !_PATHS_H_ */