summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuillaume Cottenceau <gc@mandriva.com>2003-10-09 16:20:40 +0000
committerGuillaume Cottenceau <gc@mandriva.com>2003-10-09 16:20:40 +0000
commitcb4e52fa2f824ea07f3b720583766b683819444e (patch)
treec49a8edc23f98f30b792017bf149657555fff631
parentadc2254dc3c070ebd8dfae14cbdfa79a049edefc (diff)
downloaddrakx-cb4e52fa2f824ea07f3b720583766b683819444e.tar
drakx-cb4e52fa2f824ea07f3b720583766b683819444e.tar.gz
drakx-cb4e52fa2f824ea07f3b720583766b683819444e.tar.bz2
drakx-cb4e52fa2f824ea07f3b720583766b683819444e.tar.xz
drakx-cb4e52fa2f824ea07f3b720583766b683819444e.zip
build move stuff from within move directory
-rw-r--r--mdk-stage1/Makefile8
1 files changed, 4 insertions, 4 deletions
diff --git a/mdk-stage1/Makefile b/mdk-stage1/Makefile
index 6e5fac7bf..f381a0a2b 100644
--- a/mdk-stage1/Makefile
+++ b/mdk-stage1/Makefile
@@ -47,7 +47,7 @@ top_dir = .
include $(top_dir)/Makefile.common
-DEFS = -DVERSION=\"$(VERSION)\" -DSPAWN_SHELL -DMANDRAKE_MOVE
+DEFS = -DVERSION=\"$(VERSION)\" -DSPAWN_SHELL $(ADDITIONAL_DEFS)
COMPILE = $(CC) $(DEFS) $(CFLAGS)
@@ -56,8 +56,8 @@ 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\" -DDO_KLOG
-INIT_DEFS_ADD_MANDRAKE_MOVE = -DBINARY=\"/usr/bin/install2\"
+INIT_DEFS_ADD = -DBINARY=\"/sbin/stage1\"
+INIT_DEFS_ADD_MANDRAKE_MOVE = -DBINARY=\"/usr/bin/runstage2\"
else
ifeq (x86_64, $(ARCH))
INITSRC = minilibc.c init.c
@@ -164,7 +164,7 @@ endif
endif
-BINS = init init-move stage1-full
+BINS = init stage1-full
ifeq (i386, $(ARCH))
BINS += stage1-cdrom stage1-disk stage1-network stage1-network-usb stage1-medias-usb