aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhpa <hpa>2004-12-30 21:46:46 +0000
committerhpa <hpa>2004-12-30 21:46:46 +0000
commitc60a0e56ecd7baec2c26a41238385ccdea9f5829 (patch)
tree97a37f9aeabb6a4815a08f5ff1e0c72cc438190f
parent0758734b48aa98ca4ff76d651b4f0ab0ce81b868 (diff)
downloadsyslinux-elf-c60a0e56ecd7baec2c26a41238385ccdea9f5829.tar.gz
syslinux-elf-c60a0e56ecd7baec2c26a41238385ccdea9f5829.tar.xz
syslinux-elf-c60a0e56ecd7baec2c26a41238385ccdea9f5829.zip
extlinux belongs in /sbin
-rw-r--r--Makefile8
-rw-r--r--syslinux.spec.in5
2 files changed, 10 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 63f43a87..abaab6c3 100644
--- a/Makefile
+++ b/Makefile
@@ -27,6 +27,7 @@ RANLIB = ranlib
NASM = nasm -O99
NINCLUDE =
BINDIR = /usr/bin
+SBINDIR = /usr/sbin
LIBDIR = /usr/lib
AUXDIR = $(LIBDIR)/syslinux
INCDIR = /usr/include
@@ -74,6 +75,8 @@ OBSOLETE = pxelinux.bin
# Things to install in /usr/bin
INSTALL_BIN = mtools/syslinux gethostip ppmtolss16 lss16toppm
+# Things to install in /usr/sbin
+INSTALL_SBIN = extlinux/extlinux
# Things to install in /usr/lib/syslinux
INSTALL_AUX = pxelinux.0 isolinux.bin isolinux-debug.bin \
dos/syslinux.com win32/syslinux.exe \
@@ -193,8 +196,11 @@ mkdiskimage: mkdiskimage.in mbr.bin bin2hex.pl
chmod a+x $@
install: installer
- mkdir -m 755 -p $(INSTALLROOT)$(BINDIR) $(INSTALLROOT)$(AUXDIR)
+ mkdir -m 755 -p $(INSTALLROOT)$(BINDIR)
install -m 755 -c $(INSTALL_BIN) $(INSTALLROOT)$(BINDIR)
+ mkdir -m 755 -p $(INSTALLROOT)$(SBINDIR)
+ install -m 755 -c $(INSTALL_SBIN) $(INSTALLROOT)$(SBINDIR)
+ mkdir -m 755 -p $(INSTALLROOT)$(AUXDIR)
install -m 644 -c $(INSTALL_AUX) $(INSTALLROOT)$(AUXDIR)
$(MAKE) -C com32 install
diff --git a/syslinux.spec.in b/syslinux.spec.in
index 1ee26aae..3076e78c 100644
--- a/syslinux.spec.in
+++ b/syslinux.spec.in
@@ -46,10 +46,11 @@ make -C sample tidy
%install
rm -rf %{buildroot}
mkdir -p %{buildroot}%{_bindir}
+mkdir -p %{buildroot}%{_sbindir}
mkdir -p %{buildroot}%{_libdir}/syslinux
mkdir -p %{buildroot}%{_includedir}
make install-all \
- INSTALLROOT=%{buildroot} BINDIR=%{_bindir} \
+ INSTALLROOT=%{buildroot} BINDIR=%{_bindir} SBINDIR=%{_sbindir} \
LIBDIR=%{_libdir} INCDIR=%{_includedir}
make -C sample tidy
cp mkdiskimage sys2ansi.pl keytab-lilo.pl %{buildroot}%{_libdir}/syslinux
@@ -62,7 +63,7 @@ rm -rf %{buildroot}
%doc NEWS README* *.doc memdisk/*.doc COPYING
%doc sample
%{_bindir}/syslinux
-%{_bindir}/extlinux
+%{_sbindir}/extlinux
%{_bindir}/ppmtolss16
%{_bindir}/lss16toppm
%{_bindir}/gethostip