[syslinux:firmware] libinstaller: Fixup merge botch
syslinux-bot for Matt Fleming
matt.fleming at intel.com
Fri Nov 9 09:06:35 PST 2012
Commit-ID: afd28c08dc76153efcd9f760bcdbeaabda74eb05
Gitweb: http://www.syslinux.org/commit/afd28c08dc76153efcd9f760bcdbeaabda74eb05
Author: Matt Fleming <matt.fleming at intel.com>
AuthorDate: Mon, 5 Nov 2012 20:32:08 +0000
Committer: Matt Fleming <matt.fleming at intel.com>
CommitDate: Mon, 5 Nov 2012 20:32:08 +0000
libinstaller: Fixup merge botch
The merge commit 0b26e59c8f5d didn't cause any conflicts in
libinstaller/ so this bug went unnoticed, but we need to sync the
merged libinstaller/Makefile with the changes in 1408e6ca7b38 ("Add
per-firmware object directory support").
Signed-off-by: Matt Fleming <matt.fleming at intel.com>
---
libinstaller/Makefile | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/libinstaller/Makefile b/libinstaller/Makefile
index 644ea66..48a8fd3 100644
--- a/libinstaller/Makefile
+++ b/libinstaller/Makefile
@@ -22,8 +22,8 @@ gptmbr_bin.c: $(OBJ)/../mbr/gptmbr.bin bin2c.pl
installer: $(BINFILES)
-ldlinuxc32_bin.c: ../com32/elflink/ldlinux/ldlinux.c32 bin2c.pl
- $(PERL) bin2c.pl syslinux_ldlinuxc32 < $< > $@
+ldlinuxc32_bin.c: $(OBJ)/../com32/elflink/ldlinux/ldlinux.c32 bin2c.pl
+ $(PERL) $(SRC)/bin2c.pl syslinux_ldlinuxc32 < $< > $@
tidy:
rm -f $(BINFILES)
More information about the Syslinux-commits
mailing list