package/module-init-tools/module-init-tools.patch

   1 diff -aur module-init-tools-3.1~orig/Makefile.in module-init-tools-3.1~patched/Makefile.in
   2 --- module-init-tools-3.1~orig/Makefile.in      2004-11-15 01:59:48.000000000 +0100
   3 +++ module-init-tools-3.1~patched/Makefile.in   2005-03-22 22:10:26.843808464 +0100
   4 @@ -613,7 +613,7 @@
   5  check-am: all-am
   6         $(MAKE) $(AM_MAKEFLAGS) check-TESTS
   7  check: check-am
   8 -all-am: Makefile $(PROGRAMS) $(SCRIPTS) $(MANS)
   9 +all-am: Makefile $(PROGRAMS) $(SCRIPTS)
  10
  11  installdirs:
  12         $(mkinstalldirs) $(DESTDIR)$(bindir) $(DESTDIR)$(sbindir) $(DESTDIR)$(sbindir) $(DESTDIR)$(man5dir) $(DESTDIR)$(man8dir)
  13 @@ -760,17 +760,10 @@
  14
  15  release: check clean tarball testsuite
  16
  17 -moveold: check-for-sbin check-for-old move-old-targets
  18 -
  19 -check-for-sbin:
  20 -       if [ "`echo $(DESTDIR)$(sbindir) | tr -s / /`" = /sbin ]; then :;    \
  21 -       else                                                                 \
  22 -               echo moveold usually only makes sense when installing into /sbin; \
  23 -               exit 1;                                                      \
  24 -       fi
  25 +moveold: move-old-targets
  26
  27  check-for-old:
  28 -       if [ -f /sbin/lsmod.old ]; then                                 \
  29 +       if [ -f $(sbindir)/lsmod.old ]; then                    \
  30                 echo Someone already moved old versions. >&2; exit 1;   \
  31         fi
  32
  33 @@ -778,27 +771,28 @@
  34  # RedHat 8.0 doesn't ship with readlink by default.  Use ls -l.
  35  # Also, make symlink from /bin to /sbin for lsmod (FHS compliant).
  36  move-old-targets:
  37 +       if [ ! -f $(sbindir)/lsmod.old ]; then \
  38         for f in lsmod modprobe rmmod depmod insmod modinfo; do             \
  39 -           if [ -L /sbin/$$f ]; then                                       \
  40 -               ln -sf `ls -l /sbin/$$f | sed 's/.* -> //'`.old /sbin/$$f;  \
  41 +         if [ -L $(sbindir)/$$f ]; then                            \
  42 +               ln -sf `ls -l $(sbindir)/$$f | sed 's/.* -> //'`.old  $(sbindir)/$$f;  \
  43             fi;                                                             \
  44 -           mv /sbin/$$f /sbin/$$f.old;                                     \
  45 -           if [ -f /usr/share/man/man8/$$f.8.gz ]; then                    \
  46 -               mv /usr/share/man/man8/$$f.8.gz                             \
  47 -                       /usr/share/man/man8/$$f.old.8.gz;                   \
  48 -           elif [ -f /usr/share/man/man8/$$f.8.bz2 ]; then                 \
  49 -               mv /usr/share/man/man8/$$f.8.bz2                            \
  50 -                       /usr/share/man/man8/$$f.old.8.bz2;                  \
  51 -           else                                                            \
  52 -               mv /usr/share/man/man8/$$f.8 /usr/share/man/man8/$$f.old.8; \
  53 +         mv  $(sbindir)/$$f  $(sbindir)/$$f.old;           \
  54 +           if [ -f $(prefix)/usr/share/man/man8/$$f.8.gz ]; then           \
  55 +               mv $(prefix)/usr/share/man/man8/$$f.8.gz                    \
  56 +                       $(prefix)/usr/share/man/man8/$$f.old.8.gz;          \
  57 +           elif [ -f $(prefix)/usr/share/man/man8/$$f.8.bz2 ]; then        \
  58 +               mv $(prefix)/usr/share/man/man8/$$f.8.bz2                   \
  59 +                       $(prefix)/usr/share/man/man8/$$f.old.8.bz2;         \
  60 +           elif [ -f $(prefix)/usr/share/man/man8/$$f.8 ]; then            \
  61 +               mv $(prefix)/usr/share/man/man8/$$f.8 /usr/share/man/man8/$$f.old.8; \
  62             fi;                                                             \
  63 -       done
  64 +       done; \
  65         for f in kallsyms ksyms; do                                         \
  66 -           if [ -L /sbin/$$f ]; then                                       \
  67 -               ln -sf `ls -l /sbin/$$f | sed 's/.* -> //'`.old /sbin/$$f;  \
  68 +           if [ -L $(sbindir)/$$f ]; then                          \
  69 +               ln -sf `ls -l $(sbindir)/$$f | sed 's/.* -> //'`.old $(sbindir)/$$f;  \
  70             fi;                                                             \
  71 -       done
  72 -       ln -s /sbin/lsmod.old /bin/lsmod.old
  73 +       done; \
  74 +       fi
  75
  76  # For installs in /usr/local/sbin
  77  links: