Update version for 5.4.2 release
authormarty_connor <marty_connor>
Wed, 19 Apr 2006 00:41:34 +0000 (00:41 +0000)
committermarty_connor <marty_connor>
Wed, 19 Apr 2006 00:41:34 +0000 (00:41 +0000)
src/Makefile.main

index 51b90b0..4aba889 100644 (file)
@@ -103,7 +103,7 @@ MAKEROM=    $(PERL) ./util/makerom.pl
 VERSION_MAJOR= 5
 VERSION_MINOR= 4
 VERSION_PATCH= 2
-EXTRAVERSION=   pre1
+EXTRAVERSION=
 VERSION=       $(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_PATCH)$(EXTRAVERSION)
 MM_VERSION=    $(VERSION_MAJOR).$(VERSION_MINOR)
 CFLAGS+=       -DVERSION_MAJOR=$(VERSION_MAJOR) \
@@ -438,6 +438,19 @@ endif
 
 endif
 
+# PXE Support requires TFTP protocol
+ifeq ($(findstring -DDOWNLOAD_PROTO_TFTP, $(CFLAGS)),)
+
+ifneq ($(findstring -DPXE_IMAGE,  $(CFLAGS)),)
+$(error "-DPXE_IMAGE support requires TFTP support (-DDOWNLOAD_PROTO_TFTP)")
+endif
+
+ifneq ($(findstring -DPXE_EXPORT, $(CFLAGS)),)
+$(error "-DPXE_EXPORT support requires TFTP support (-DDOWNLOAD_PROTO_TFTP)")
+endif
+
+endif
+
 # Auto-incrementing build serial number.  Is auto-incremented for each
 # make run that specifies a final image file (e.g. bin/undi.zpxe) as a
 # target, or a target of the form "all*".  Enable via -DBUILD_SERIAL