patch-2.0.8 linux/arch/i386/boot/Makefile

• Lines: 26
• Date: Wed Jul 17 14:59:14 1996
• Orig file: v2.0.7/linux/arch/i386/boot/Makefile
• Orig date: Tue May 7 16:22:17 1996

diff -u --recursive --new-file v2.0.7/linux/arch/i386/boot/Makefile linux/arch/i386/boot/Makefile
@@ -18,7 +18,11 @@
 
 zImage: $(CONFIGURE) bootsect setup compressed/vmlinux tools/build
 ifdef CONFIG_KERNEL_ELF
-	$(OBJDUMP) $(OBJDUMP_FLAGS) -o $(ZIMAGE_OFFSET) compressed/vmlinux > compressed/vmlinux.out
+	if hash $(ENCAPS) 2> /dev/null; then \
+	  $(OBJDUMP) $(OBJDUMP_FLAGS) -o $(ZIMAGE_OFFSET) compressed/vmlinux > compressed/vmlinux.out; \
+	else \
+	  $(OBJCOPY) compressed/vmlinux compressed/vmlinux.out; \
+	fi
 	tools/build bootsect setup compressed/vmlinux.out $(ROOT_DEV) > zImage
 else
 	tools/build bootsect setup compressed/vmlinux $(ROOT_DEV) > zImage
@@ -27,7 +31,11 @@
 
 bzImage: $(CONFIGURE) bbootsect setup compressed/bvmlinux tools/bbuild
 ifdef CONFIG_KERNEL_ELF
-	$(OBJDUMP) $(OBJDUMP_FLAGS) -o $(IMAGE_OFFSET) compressed/bvmlinux > compressed/bvmlinux.out
+	if hash $(ENCAPS) 2> /dev/null; then \
+	  $(OBJDUMP) $(OBJDUMP_FLAGS) -o $(IMAGE_OFFSET) compressed/bvmlinux > compressed/bvmlinux.out; \
+	else \
+	  $(OBJCOPY) compressed/bvmlinux compressed/bvmlinux.out; \
+	fi
 	tools/bbuild bbootsect setup compressed/bvmlinux.out $(ROOT_DEV) > bzImage
 else
 	tools/bbuild bbootsect setup compressed/bvmlinux $(ROOT_DEV) > bzImage