summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhpa <hpa>2003-01-30 20:53:44 +0000
committerhpa <hpa>2003-01-30 20:53:44 +0000
commit02c6d2500ae67979c5be11cbdc76fdc36395cc8c (patch)
tree5e121697e379e2a8f87881ca91c77ea930ac0fcc
parent649c729de59c622b6cd604ccb6e196b4d3740d4b (diff)
downloadsyslinux-02c6d2500ae67979c5be11cbdc76fdc36395cc8c.tar.gz
Make it possible (but optional) to install the library.syslinux-2.01
-rw-r--r--Makefile19
-rw-r--r--NEWS3
2 files changed, 18 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index e04f219d..04bc17d5 100644
--- a/Makefile
+++ b/Makefile
@@ -25,7 +25,9 @@ RANLIB = ranlib
NASM = nasm -O99
NINCLUDE =
BINDIR = /usr/bin
-LIBDIR = /usr/lib/syslinux
+LIBDIR = /usr/lib
+AUXDIR = $(LIBDIR)/syslinux
+INCDIR = /usr/include
PERL = perl
@@ -55,8 +57,12 @@ OBSOLETE = pxelinux.bin
# Things to install in /usr/bin
INSTALL_BIN = syslinux gethostip ppmtolss16 lss16toppm
# Things to install in /usr/lib/syslinux
-INSTALL_LIB = pxelinux.0 isolinux.bin isolinux-debug.bin \
+INSTALL_AUX = pxelinux.0 isolinux.bin isolinux-debug.bin \
syslinux.com copybs.com memdisk/memdisk
+# Things to install in /usr/lib
+INSTALL_LIB = libsyslinux.a
+# Things to install in /usr/include
+INSTALL_INC = syslinux.h
# The DATE is set on the make command line when building binaries for
# official release. Otherwise, substitute a hex string that is pretty much
@@ -154,9 +160,16 @@ mkdiskimage: mkdiskimage.in mbr.bin bin2hex.pl
chmod a+x $@
install: installer
- mkdir -m 755 -p $(INSTALLROOT)$(BINDIR) $(INSTALLROOT)$(LIBDIR)
+ mkdir -m 755 -p $(INSTALLROOT)$(BINDIR) $(INSTALLROOT)$(AUXDIR)
install -m 755 -c $(INSTALL_BIN) $(INSTALLROOT)$(BINDIR)
+ install -m 644 -c $(INSTALL_AUX) $(INSTALLROOT)$(AUXDIR)
+
+install-lib: installer
+ mkdir -m 755 -p $(INSTALLROOT)$(LIBDIR) $(INSTALLDIR)$(INCDIR)
install -m 644 -c $(INSTALL_LIB) $(INSTALLROOT)$(LIBDIR)
+ install -m 644 -c $(INSTALL_INC) $(INSTALLROOT)$(INCDIR)
+
+install-all: install install-all
local-tidy:
rm -f *.o *_bin.c stupid.* patch.offset
diff --git a/NEWS b/NEWS
index 1fa75bb9..f57b8c96 100644
--- a/NEWS
+++ b/NEWS
@@ -15,7 +15,8 @@ Changes in 2.01:
* PXELINUX, ISOLINUX: Fix some COMBOOT API calls.
* PXELINUX: Doc fix.
* Build SYSLINUX into a small library for encapsulation into
- other programs.
+ other programs (however, please keep in mind this is a GPL'd
+ library.)
* SYSLINUX: Make installer work with "owner" in /etc/fstab.
* SYSLINUX: Fix issue with working on nonpartitioned hard disk
devices. THIS CONFIGURATION IS NOT RECOMMENDED.