From 3ede311eec28bba77f3469d4e0a834ac000f686e Mon Sep 17 00:00:00 2001 From: Matt Fleming Date: Fri, 12 Jul 2013 10:53:38 +0100 Subject: Makefile.private: only delete mk/devel.mk for production releases Since we've now got support for dynamic debug, include mk/devel.mk in prerelease tarballs so that users can enable that feature when building from source. Signed-off-by: Matt Fleming --- Makefile.private | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Makefile.private b/Makefile.private index 37dd259a..f63743d6 100644 --- a/Makefile.private +++ b/Makefile.private @@ -18,7 +18,8 @@ .PHONY: official release # These files are removed when tarballs are generated. -PRIVATE = Makefile.private mk/devel.mk +PRE_PRIVATE = Makefile.private +REL_PRIVATE = $(PRE_PRIVATE) mk/devel.mk GIT_DIR ?= .git ABS_GIT_DIR := $(shell cd '$(GIT_DIR)' 2>/dev/null && pwd) @@ -58,7 +59,7 @@ release: rm -f release/syslinux-$(VERSION)/syslinux.spec.in $(MAKE) -C release/syslinux-$(VERSION) official DATE=`date +%Y-%m-%d` - cd release/syslinux-$(VERSION) && rm -rf $(PRIVATE) + cd release/syslinux-$(VERSION) && rm -rf $(REL_PRIVATE) cd release && tar cvvf - syslinux-$(VERSION) | \ gzip -9 > syslinux-$(VERSION).tar.gz cd release/syslinux-$(VERSION) && \ @@ -87,7 +88,7 @@ prerel: > $(PRERELDIR)/$(PREREL)/syslinux.spec rm -f $(PRERELDIR)/$(PREREL)/syslinux.spec.in $(MAKE) -C $(PRERELDIR)/$(PREREL) official DATE=`printf '%s-pre%d ' $(VERSION) $(PRERELNO) | dd bs=10 count=1 2>/dev/null` - cd $(PRERELDIR)/$(PREREL) && rm -rf $(PRIVATE) + cd $(PRERELDIR)/$(PREREL) && rm -rf $(PRE_PRIVATE) cd $(PRERELDIR) && tar cvvf - $(PREREL) | \ gzip -9 > $(PREREL).tar.gz cd $(PRERELDIR)/$(PREREL) && \ -- cgit