util-linux-fhs.patch

   1 diff -Nur util-linux-2.9r/lib/pathnames.h util-linux-2.9r.pld/lib/pathnames.h
   2 --- util-linux-2.9r/lib/pathnames.h     Thu Jun 10 12:46:57 1999
   3 +++ util-linux-2.9r.pld/lib/pathnames.h Thu Jun 10 12:23:57 1999
   4 @@ -51,6 +51,10 @@
   5  #define LOGDIR                  "/var/log"
   6  #endif
   7
   8 +#ifndef DATAMISCDIR
   9 +#define DATAMISCDIR              "/usr/share/misc"
  10 +#endif
  11 +
  12  #ifndef VARPATH
  13  #define VARPATH                        "/var"
  14  #endif
  15 @@ -66,14 +70,14 @@
  16  #define SECURETTY              "/etc/securetty"
  17  #define _PATH_UTMP             "/var/run/utmpx"
  18  #define _PATH_WTMP             LOGDIR "/wtmpx"
  19 -#define _PATH_WTMPLOCK         "/etc/wtmplock"
  20 +#define _PATH_WTMPLOCK         "/var/lock/wtmpxlock"
  21
  22  /* no more . in DEFPATH */
  23  #define        _PATH_DEFPATH           "/usr/local/bin:/bin:/usr/bin"
  24  #define        _PATH_DEFPATH_ROOT      SBINDIR ":/bin:" USRSBINDIR ":/usr/bin"
  25  #define        _PATH_HUSHLOGIN         ".hushlogin"
  26  #define        _PATH_LASTLOG           LOGDIR "/lastlog"
  27 -#define        _PATH_MAILDIR           VARPATH "/spool/mail"
  28 +#define        _PATH_MAILDIR           VARPATH "/mail"
  29  #define        _PATH_MOTDFILE          "/etc/motd"
  30  #define        _PATH_NOLOGIN           "/etc/nologin"
  31
  32 @@ -100,5 +104,5 @@
  33  #define _PATH_GTMP              "/etc/gtmp"
  34  #define _PATH_GTMPTMP           "/etc/gtmptmp"
  35
  36 -#define _PATH_WORDS             "/usr/dict/words"
  37 -#define _PATH_WORDS_ALT         "/usr/dict/web2"
  38 +#define _PATH_WORDS             "/usr/share/dict/words"
  39 +#define _PATH_WORDS_ALT         "/usr/share/dict/web2"
  40 diff -Nur util-linux-2.9r/text-utils/Makefile util-linux-2.9r.pld/text-utils/Makefile
  41 --- util-linux-2.9r/text-utils/Makefile Wed Feb 24 19:48:48 1999
  42 +++ util-linux-2.9r.pld/text-utils/Makefile     Thu Jun 10 12:26:19 1999
  43 @@ -20,7 +20,7 @@
  44
  45  # Where to put datebase files?
  46
  47 -USRLIB=                more.help
  48 +DATAMISC=      more.help
  49
  50  # Programs requiring special compilation
  51
  52 @@ -60,10 +60,10 @@
  53  endif
  54
  55  install install.shadow install.text-utils: all
  56 -       $(INSTALLDIR) $(BINDIR) $(USRBINDIR) $(USRLIBDIR) $(MAN1DIR)
  57 +       $(INSTALLDIR) $(BINDIR) $(USRBINDIR) $(DATAMISCDIR) $(MAN1DIR)
  58         $(INSTALLBIN) $(BIN) $(BINDIR)
  59         $(INSTALLBIN) $(USRBIN) $(USRBINDIR)
  60 -       $(INSTALLDAT) $(USRLIB) $(USRLIBDIR)
  61 +       $(INSTALLDAT) $(DATAMISC) $(DATAMISCDIR)
  62         $(INSTALLMAN) $(MAN1) $(MAN1DIR)
  63
  64  .PHONY: clean distclean
  65 diff -Nur util-linux-2.9r/text-utils/more.c util-linux-2.9r.pld/text-utils/more.c
  66 --- util-linux-2.9r/text-utils/more.c   Thu Jun 10 12:46:56 1999
  67 +++ util-linux-2.9r.pld/text-utils/more.c       Thu Jun 10 12:21:02 1999
  68 @@ -57,7 +57,7 @@
  69  #include <locale.h>
  70  #include "nls.h"
  71
  72 -#define HELPFILE       "/usr/lib/more.help"
  73 +#define HELPFILE       "/usr/share/misc/more.help"
  74  #define VI             "/usr/bin/vi"
  75
  76  #define Fopen(s,m)     (Currline = 0,file_pos=0,fopen(s,m))