aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhpa <hpa>2004-12-30 21:49:42 +0000
committerhpa <hpa>2004-12-30 21:49:42 +0000
commitd31e109e0ea845e5c94422afd1c0ee93309a8045 (patch)
tree74a4ec223e15b1be3fd945260df41c8ccf388799
parentc60a0e56ecd7baec2c26a41238385ccdea9f5829 (diff)
downloadsyslinux-elf-syslinux-3.00-pre10.tar.gz
syslinux-elf-syslinux-3.00-pre10.tar.xz
syslinux-elf-syslinux-3.00-pre10.zip
Install extlinux in /sbin, not /usr/sbinsyslinux-3.00-pre10
-rw-r--r--Makefile4
-rw-r--r--syslinux.spec.in4
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