fix paths to enable ia32 build on x86_64 host

[debian/elilo] / Makefile

diff --git a/Makefile b/Makefile
index 73dc4d4f731f5f71579fc6607c3d0c9996077e28..98d032391fadc03e7dfaab1c8ed239e700f56b60 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -25,15 +25,19 @@
 # to use this program.
 #
 
-include Make.defaults
-TOPDIR=.
+SRCDIR = .
+
+VPATH = $(SRCDIR)
+
+include $(SRCDIR)/Make.defaults
+TOPDIR = $(SRCDIR)
 
 
 CRTOBJS       = $(EFICRT0)/crt0-efi-$(ARCH).o
 LDSCRIPT      = $(EFICRT0)/elf_$(ARCH)_efi.lds
 
 LDFLAGS             += -T $(LDSCRIPT) -shared -Bsymbolic -L$(EFILIB) -L$(GNUEFILIB) $(CRTOBJS)
-LOADLIBES     = -lefi -lgnuefi $(shell $(CC) -print-libgcc-file-name)
+LOADLIBES     = -lefi -lgnuefi $(shell $(CC) $(ARCH3264) -print-libgcc-file-name)
 FORMAT        = efi-app-$(ARCH)
 
 FILESYSTEM    =
@@ -67,7 +71,7 @@ endif
 FILES = elilo.o getopt.o strops.o loader.o \
         fileops.o util.o vars.o alloc.o chooser.o  \
        config.o initrd.o alternate.o bootparams.o \
-       gunzip.o fs/fs.o \
+       gunzip.o console.o fs/fs.o \
        choosers/choosers.o \
        devschemes/devschemes.o \
        $(ARCH)/sysdeps.o \
@@ -87,7 +91,8 @@ fileops.o : Make.defaults
 chooser.o : Make.defaults
 
 $(SUBDIRS): dummy
-       $(MAKE) -C $@
+       mkdir -p $@
+       $(MAKE) -C $@ -f $(SRCDIR)/../$@/Makefile SRCDIR=$(SRCDIR)/../$@ ARCH=$(ARCH)
 
 dummy:
 
@@ -106,4 +111,4 @@ ifeq ($(GCC_VERSION),2)
        @exit 1
 endif
 
-include Make.rules
+include $(SRCDIR)/Make.rules