From ee09a3494a73cac2605fd30bae546f7bbd1662d7 Mon Sep 17 00:00:00 2001 From: Pascal Rigaux Date: Fri, 12 Nov 2004 17:30:51 +0000 Subject: some defines are not arch dependent --- mdk-stage1/Makefile | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/mdk-stage1/Makefile b/mdk-stage1/Makefile index 1c01fc4ed..ed46192ad 100644 --- a/mdk-stage1/Makefile +++ b/mdk-stage1/Makefile @@ -56,12 +56,6 @@ COMPILE = $(CC) $(DEFS) $(CFLAGS) ifeq (i386, $(ARCH)) INITSRC = minilibc.c init.c INIT_DEFS = -DINIT_HEADERS=\"minilibc.h\" -fno-builtin -INIT_DEFS_ADD = -DBINARY=\"/sbin/stage1\" -ifdef MOVE -INIT_DEFS_ADD_STAGE2 = -DBINARY=\"/usr/bin/runstage2.pl\" -else -INIT_DEFS_ADD_STAGE2 = -DBINARY=\"/usr/bin/runinstall2\" -endif else ifeq (x86_64, $(ARCH)) INITSRC = minilibc.c init.c @@ -76,6 +70,13 @@ endif endif endif +INIT_DEFS_ADD = -DBINARY=\"/sbin/stage1\" +ifdef MOVE +INIT_DEFS_ADD_STAGE2 = -DBINARY=\"/usr/bin/runstage2.pl\" +else +INIT_DEFS_ADD_STAGE2 = -DBINARY=\"/usr/bin/runinstall2\" +endif + INITOBJS = $(subst .c,.o,$(INITSRC)) INITOBJS-STAGE2 = $(subst .c,-STAGE2.o,$(INITSRC)) -- cgit v1.2.1