From d31e109e0ea845e5c94422afd1c0ee93309a8045 Mon Sep 17 00:00:00 2001 From: hpa Date: Thu, 30 Dec 2004 21:49:42 +0000 Subject: Install extlinux in /sbin, not /usr/sbin --- Makefile | 4 ++-- syslinux.spec.in | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index abaab6c3..e1c35e7c 100644 --- a/Makefile +++ b/Makefile @@ -27,7 +27,7 @@ RANLIB = ranlib NASM = nasm -O99 NINCLUDE = BINDIR = /usr/bin -SBINDIR = /usr/sbin +SBINDIR = /sbin LIBDIR = /usr/lib AUXDIR = $(LIBDIR)/syslinux INCDIR = /usr/include @@ -75,7 +75,7 @@ OBSOLETE = pxelinux.bin # Things to install in /usr/bin INSTALL_BIN = mtools/syslinux gethostip ppmtolss16 lss16toppm -# Things to install in /usr/sbin +# Things to install in /sbin INSTALL_SBIN = extlinux/extlinux # Things to install in /usr/lib/syslinux INSTALL_AUX = pxelinux.0 isolinux.bin isolinux-debug.bin \ diff --git a/syslinux.spec.in b/syslinux.spec.in index 3076e78c..03e2e1f6 100644 --- a/syslinux.spec.in +++ b/syslinux.spec.in @@ -20,6 +20,10 @@ Requires: mtools, libc.so.6 Requires: mtools, libc.so.6()(64bit) %endif +# NOTE: extlinux belongs in /sbin, not in /usr/sbin, since it is typically +# a system bootloader, and may be necessary for system recovery. +%define _sbindir /sbin + %package devel Summary: Development environment for SYSLINUX add-on modules Group: Development/Libraries -- cgit v1.2.1