aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt Fleming <matt.fleming@intel.com>2013-06-11 14:03:31 +0100
committerMatt Fleming <matt.fleming@intel.com>2013-06-11 14:03:31 +0100
commit32b98b8235bd3a4724ebdf9b475cd6c3ae3ce4c4 (patch)
tree2255b3854f350a33b8fe559347205eb747183414
parent3d3f765a61f67acf86acee0fed0dc5fabfd8a6fd (diff)
downloadsyslinux-32b98b8235bd3a4724ebdf9b475cd6c3ae3ce4c4.tar.gz
syslinux-32b98b8235bd3a4724ebdf9b475cd6c3ae3ce4c4.tar.xz
syslinux-32b98b8235bd3a4724ebdf9b475cd6c3ae3ce4c4.zip
efi: install ldlinux.{e32,e64}
We need to install the corresonding ldlinux.* file for each of the firmware. Signed-off-by: Matt Fleming <matt.fleming@intel.com>
-rw-r--r--Makefile9
-rw-r--r--efi/Makefile3
2 files changed, 6 insertions, 6 deletions
diff --git a/Makefile b/Makefile
index 115ed8f1..38611684 100644
--- a/Makefile
+++ b/Makefile
@@ -329,12 +329,13 @@ install: local-install
-f $(SRC)/$$i/Makefile $@; done
else
install:
+ mkdir -m 755 -p $(INSTALLROOT)$(AUXDIR)/efi$(BITS)
set -e ; for i in $(INSTALLSUBDIRS) ; \
do $(MAKE) -C $$i SRC="$(SRC)/$$i" OBJ="$(OBJ)/$$i" \
- BITS="$(BITS)" -f $(SRC)/$$i/Makefile $@; done
-
- mkdir -m 755 -p $(INSTALLROOT)$(AUXDIR)/efi$(BITS)
- install -m 755 $(MODULES) $(INSTALLROOT)$(AUXDIR)/efi$(BITS)
+ BITS="$(BITS)" AUXDIR="$(AUXDIR)/efi$(BITS)" \
+ -f $(SRC)/$$i/Makefile $@; done
+ -install -m 644 $(INSTALLABLE_MODULES) $(INSTALLROOT)$(AUXDIR)/efi$(BITS)
+ install -m 644 com32/elflink/ldlinux/$(LDLINUX) $(INSTALLROOT)$(AUXDIR)/efi$(BITS)
endif
netinstall: installer
diff --git a/efi/Makefile b/efi/Makefile
index cb99f2a2..20034301 100644
--- a/efi/Makefile
+++ b/efi/Makefile
@@ -69,8 +69,7 @@ codepage.o: ../codepage/cp865.cp
installer: syslinux.efi
install: all
- mkdir -m 755 -p $(INSTALLROOT)$(AUXDIR)/efi$(BITS)
- install -m 755 $(BTARGET) $(INSTALLROOT)$(AUXDIR)/efi$(BITS)
+ install -m 755 $(BTARGET) $(INSTALLROOT)$(AUXDIR)
strip: