aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile3
-rw-r--r--com32/Makefile2
-rw-r--r--com32/lib/Makefile11
-rw-r--r--com32/libutil/Makefile11
-rw-r--r--com32/modules/Makefile15
-rw-r--r--com32/samples/Makefile2
-rw-r--r--syslinux.spec.in2
7 files changed, 42 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index a7e741b7..6706c11c 100644
--- a/Makefile
+++ b/Makefile
@@ -188,6 +188,7 @@ install: installer
mkdir -m 755 -p $(INSTALLROOT)$(BINDIR) $(INSTALLROOT)$(AUXDIR)
install -m 755 -c $(INSTALL_BIN) $(INSTALLROOT)$(BINDIR)
install -m 644 -c $(INSTALL_AUX) $(INSTALLROOT)$(AUXDIR)
+ $(MAKE) -C com32 install
install-lib: installer
mkdir -m 755 -p $(INSTALLROOT)$(LIBDIR) $(INSTALLDIR)$(INCDIR)
@@ -196,7 +197,7 @@ install-lib: installer
cd $(INSTALLROOT)$(LIBDIR) && ln -sf $(LIB_SO) libsyslinux.so
if [ -z '$(INSTALLROOT)' ]; then ldconfig; fi
-install-all: install install-all
+install-all: install install-lib
local-tidy:
rm -f *.o *_bin.c stupid.* patch.offset
diff --git a/com32/Makefile b/com32/Makefile
index 5d657ff4..7e7bfcb6 100644
--- a/com32/Makefile
+++ b/com32/Makefile
@@ -1,4 +1,4 @@
SUBDIRS = lib libutil modules samples
-all tidy clean spotless:
+all tidy clean spotless install:
for d in $(SUBDIRS); do $(MAKE) -C $$d $@; done
diff --git a/com32/lib/Makefile b/com32/lib/Makefile
index a7dea0d5..21f41ef1 100644
--- a/com32/lib/Makefile
+++ b/com32/lib/Makefile
@@ -25,6 +25,11 @@ LIBOBJS = abort.o atexit.o atoi.o atol.o atoll.o calloc.o creat.o \
sys/null_read.o sys/null_write.o sys/serial_write.o \
sys/ansicon_write.o sys/ansiserial_write.o
+BINDIR = /usr/bin
+LIBDIR = /usr/lib
+AUXDIR = $(LIBDIR)/syslinux
+INCDIR = /usr/include
+COM32DIR = $(AUXDIR)/com32
all: libcom32.a
@@ -42,4 +47,10 @@ clean: tidy
spotless: clean
rm -f *~ \#* */*~ */\#*
+install: all
+ mkdir -m 755 -p $(INSTALLROOT)$(COM32DIR)
+ install -m 644 libcom32.a com32.ld $(INSTALLROOT)$(COM32DIR)
+ -rm -rf $(INSTALLROOT)$(COM32DIR)/include
+ cp -r ../include $(INSTALLDOOR)$(COM32DIR)
+
-include .*.d
diff --git a/com32/libutil/Makefile b/com32/libutil/Makefile
index 1090dbd8..12c5c110 100644
--- a/com32/libutil/Makefile
+++ b/com32/libutil/Makefile
@@ -52,6 +52,12 @@ LNXLIBOBJS = $(patsubst %.o,%.lo,$(LIBOBJS))
.SUFFIXES: .lss .c .lo .o .elf .c32 .lnx
+BINDIR = /usr/bin
+LIBDIR = /usr/lib
+AUXDIR = $(LIBDIR)/syslinux
+INCDIR = /usr/include
+COM32DIR = $(AUXDIR)/com32
+
all: libutil_com.a libutil_lnx.a
libutil_com.a: $(LIBOBJS)
@@ -99,3 +105,8 @@ clean: tidy
spotless: clean
rm -f *~ \#*
+
+install: all
+ mkdir -m 755 -p $(INSTALLROOT)$(COM32DIR)
+ install -m 644 libutil_com.a libutil_lnx.a $(INSTALLROOT)$(COM32DIR)
+
diff --git a/com32/modules/Makefile b/com32/modules/Makefile
index ada285c9..f64cf377 100644
--- a/com32/modules/Makefile
+++ b/com32/modules/Makefile
@@ -39,7 +39,15 @@ LNXLIBS = ../libutil/libutil_lnx.a
.SUFFIXES: .lss .c .o .elf .c32 .lnx
-all: chain.c32
+BINDIR = /usr/bin
+LIBDIR = /usr/lib
+AUXDIR = $(LIBDIR)/syslinux
+INCDIR = /usr/include
+COM32DIR = $(AUXDIR)/com32
+
+MODULES = chain.c32
+
+all: $(MODULES)
.PRECIOUS: %.o
%.o: %.S
@@ -76,3 +84,8 @@ clean: tidy
spotless: clean
rm -f *~ \#*
+
+install: all
+ mkdir -m 755 -p $(INSTALLROOT)$(AUXDIR)
+ install -m 644 $(MODULES) $(INSTALLROOT)$(AUXDIR)
+
diff --git a/com32/samples/Makefile b/com32/samples/Makefile
index a0a45bc9..574ea89e 100644
--- a/com32/samples/Makefile
+++ b/com32/samples/Makefile
@@ -78,3 +78,5 @@ clean: tidy
spotless: clean
rm -f *~ \#*
+
+install: # Don't install samples
diff --git a/syslinux.spec.in b/syslinux.spec.in
index 9f6b5da6..060a4f00 100644
--- a/syslinux.spec.in
+++ b/syslinux.spec.in
@@ -39,7 +39,7 @@ rm -rf %{buildroot}
mkdir -p %{buildroot}%{_bindir}
mkdir -p %{buildroot}%{_libdir}/syslinux
mkdir -p %{buildroot}%{_includedir}
-make install install-lib \
+make install-all \
INSTALLROOT=%{buildroot} BINDIR=%{_bindir} \
LIBDIR=%{_libdir} INCDIR=%{_includedir}
make -C sample tidy