diff options
author | Matt Fleming <matt.fleming@intel.com> | 2012-11-05 20:32:08 +0000 |
---|---|---|
committer | Matt Fleming <matt.fleming@intel.com> | 2012-11-05 20:32:08 +0000 |
commit | afd28c08dc76153efcd9f760bcdbeaabda74eb05 (patch) | |
tree | ab04f981e32cfa9f60f5956fb35f55e8261ed8ad | |
parent | 7657207d2d2677806bfc79f6326046583cdd5c4c (diff) | |
download | syslinux-afd28c08dc76153efcd9f760bcdbeaabda74eb05.tar.gz syslinux-afd28c08dc76153efcd9f760bcdbeaabda74eb05.tar.xz syslinux-afd28c08dc76153efcd9f760bcdbeaabda74eb05.zip |
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@intel.com>
-rw-r--r-- | libinstaller/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libinstaller/Makefile b/libinstaller/Makefile index 644ea664..48a8fd3a 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) |