diff options
Diffstat (limited to 'bsd')
| -rw-r--r-- | bsd/Makefile | 5 | ||||
| -rw-r--r-- | bsd/pathnames.h | 11 |
2 files changed, 7 insertions, 9 deletions
diff --git a/bsd/Makefile b/bsd/Makefile index 6baf09d5..8783c5b3 100644 --- a/bsd/Makefile +++ b/bsd/Makefile @@ -1,14 +1,11 @@ # Makefile -- Makefile for util-linux Linux utilities # Created: Sat Dec 26 20:09:40 1992 -# Revised: Sat Feb 4 19:35:59 1995 by faith@cs.unc.edu +# Revised: Fri Mar 10 21:20:41 1995 by faith@cs.unc.edu # Copyright 1992, 1993, 1994, 1995 Rickard E. Faith (faith@cs.unc.edu) # include ../MCONFIG -%.o: %.c - $(CC) -c $(CFLAGS) $< -o $@ - all: err.o getopt.o err.o: err.c getopt.o: getopt.c diff --git a/bsd/pathnames.h b/bsd/pathnames.h index 7dca388e..b37c6793 100644 --- a/bsd/pathnames.h +++ b/bsd/pathnames.h @@ -38,19 +38,19 @@ #undef _PATH_MAILDIR #ifndef SBINDIR -#define SBINDIR "/etc" +#define SBINDIR "/sbin" #endif #ifndef USRSBINDIR -#define USRSBINDIR "/etc" +#define USRSBINDIR "/usr/sbin" #endif #ifndef LOGDIR -#define LOGDIR "/etc" +#define LOGDIR "/var/log" #endif #ifndef VARPATH -#define VARPATH "/usr" +#define VARPATH "/var" #endif #define _PATH_BSHELL "/bin/sh" @@ -59,7 +59,7 @@ #define _PATH_TTY "/dev/tty" #define TTYTYPES "/etc/ttytype" #define SECURETTY "/etc/securetty" -#define _PATH_UTMP LOGDIR "/utmp" +#define _PATH_UTMP "/var/run/utmp" #define _PATH_WTMP LOGDIR "/wtmp" #define _PATH_DEFPATH "/usr/local/bin:/bin:/usr/bin:." @@ -81,6 +81,7 @@ #define _PATH_MTAB "/etc/mtab" #define _PATH_UMOUNT "/bin/umount" #define UMOUNT_ARGS "umount", "-a" +#define SWAPOFF_ARGS "swapoff", "-a" #define _PATH_PASSWD "/etc/passwd" #define _PATH_PTMP "/etc/ptmp" |