Changing location of ldlinux files.

1 files changed, 16 insertions, 5 deletions

diff --git a/Makefile b/Makefile
index 54eb12c..1cd940d 100644
--- a/Makefile
+++ b/Makefile
@@ -52,7 +52,8 @@ PREREQ_CNF		= \
                           syslinux/pxelinux.cfg \
                           syslinux/syslinux.cfg
 PREREQ_BIN              = \
-                          syslinux/iperd.dep
+                          ldlinux.e32 \
+                          ldlinux.e64
 CLEANFILES              = \
                           images \
                           syslinux
@@ -219,19 +220,29 @@ syslinux/iperd.dep: tmp/syslinux-$(SYSLINUX_VERSION)/iperd.dep
         rsync -ra "$(PWD)/tmp/syslinux/usr/bin/"            syslinux/bin
         rsync -ra "$(PWD)/tmp/syslinux/sbin/"               syslinux/sbin
         cp syslinux/efi32/syslinux.efi                      syslinux/efi32/syslinux.efi.0
-        cp syslinux/efi32/ldlinux.e32                       syslinux/
-        cp syslinux/efi64/ldlinux.e64                       syslinux/
         cp syslinux/efi64/syslinux.efi                      syslinux/efi64/syslinux.efi.0
         cp $(SYSLINDIR)/f1.txt                              syslinux/
         cp $(SYSLINDIR)/f2.txt                              syslinux/
-        cp $(SYSLINDIR)/lpxelinux.cfg                       syslinux/efi32/
+        cp $(SYSLINDIR)/lpxelinux.cfg                       syslinux/
         cp $(SYSLINDIR)/efi32/pxelinux.cfg                  syslinux/efi32/
-        cp $(SYSLINDIR)/efi64/pxelinux.cfg                  syslinux/efi32/
+        cp $(SYSLINDIR)/efi64/pxelinux.cfg                  syslinux/efi64/
         cp /usr/share/hwdata/pci.ids                        syslinux/
         cp /lib/modules/$$(uname -r)/modules.alias          syslinux/modules.als
         @touch "$(@)"
 
 
+ldlinux.e32: syslinux/iperd.dep
+        @mkdir -p $$(dirname $(@))
+        cp syslinux/efi32/ldlinux.e32 $(@)
+        @touch $(@)
+
+
+ldlinux.e64: syslinux/iperd.dep
+        @mkdir -p $$(dirname $(@))
+        cp syslinux/efi64/ldlinux.e64 $(@)
+        @touch $(@)
+
+
 syslinux/isolinux.cfg: Makefile.config $(ISOLINUX_CFG) $(PREREQ_BIN) $(SYSLINDIR)/common.cfg
         @rm -f "$(@)"
         @mkdir -p "$$(dirname "$(@)")"