summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2004-11-12 17:30:51 +0000
committerPascal Rigaux <pixel@mandriva.com>2004-11-12 17:30:51 +0000
commitee09a3494a73cac2605fd30bae546f7bbd1662d7 (patch)
treee41962c1c913b3c990198bc7394062da4d9fc221
parent524762eb79efa427e6ba9aebfeab7687027d0f4f (diff)
downloaddrakx-ee09a3494a73cac2605fd30bae546f7bbd1662d7.tar
drakx-ee09a3494a73cac2605fd30bae546f7bbd1662d7.tar.gz
drakx-ee09a3494a73cac2605fd30bae546f7bbd1662d7.tar.bz2
drakx-ee09a3494a73cac2605fd30bae546f7bbd1662d7.tar.xz
drakx-ee09a3494a73cac2605fd30bae546f7bbd1662d7.zip
some defines are not arch dependent
-rw-r--r--mdk-stage1/Makefile13
1 files 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))