diff --git a/zipl/Makefile b/zipl/Makefile index aa7af702..38dfae9e 100644 --- a/zipl/Makefile +++ b/zipl/Makefile @@ -6,6 +6,7 @@ all: $(MAKE) -C src install: all + $(MAKE) -C boot install $(MAKE) -C src install $(MAKE) -C man install $(MAKE) -C dracut install diff --git a/zipl/boot/Makefile b/zipl/boot/Makefile index 2ea129bf..92d7d63a 100644 --- a/zipl/boot/Makefile +++ b/zipl/boot/Makefile @@ -26,6 +26,10 @@ all: .loaders $(FILES) $(DEBUG_FILES) .loaders: $(INC_FILES) touch .loaders +install: stage3.bin + $(INSTALL) -d -m 755 "$(DESTDIR)$(TOOLS_LIBDIR)" + $(INSTALL) -g $(GROUP) -o $(OWNER) -m 644 stage3.bin "$(DESTDIR)$(TOOLS_LIBDIR)" + # Prevent make from using some default rules... %: %.S diff --git a/zipl/src/Makefile b/zipl/src/Makefile index ead6a4c4..153eaecc 100644 --- a/zipl/src/Makefile +++ b/zipl/src/Makefile @@ -14,9 +14,8 @@ objects = misc.o error.o scan.o job.o boot.o bootmap.o fs-map.o disk.o \ zipl_helpers = $(basename $(wildcard zipl_helper.*.c)) chreipl_helpers = $(subst zipl_,chreipl_, $(zipl_helpers)) -zipl_stage3 = ../boot/stage3.bin -all: zipl zipl-editenv $(chreipl_helpers) $(zipl_stage3) +all: zipl zipl-editenv $(chreipl_helpers) boot.o: ../boot/.loaders zipl: $(objects) $(libs) @@ -38,7 +37,6 @@ install: all $(INSTALL) -m 755 $(zipl_helpers) $(chreipl_helpers) \ $(DESTDIR)$(TOOLS_LIBDIR) $(CP) --no-dereference $(chreipl_helpers) $(DESTDIR)$(TOOLS_LIBDIR) - $(CP) --no-dereference $(zipl_stage3) $(DESTDIR)$(TOOLS_LIBDIR) clean: rm -f *.o $(zipl_helpers) $(chreipl_helpers) zipl zipl-editenv @@ -49,6 +47,3 @@ clean: ../boot/.loaders: $(MAKE) -C ../boot .loaders - -../boot/stage3.bin: - $(MAKE) -C ../boot stage3.bin