diff options
| author | Matt Fleming <matt.fleming@intel.com> | 2013-07-19 18:11:01 +0100 |
|---|---|---|
| committer | Matt Fleming <matt.fleming@intel.com> | 2013-07-19 18:11:01 +0100 |
| commit | 56973f80f2728d3418b09047a7b023aa3c46e6e2 (patch) | |
| tree | 2ca2a419aac725f77c117d0d52a6eb53fcd6b1ab | |
| parent | 5e589953fdb4afaf3ea2a566bc8d635853ab984f (diff) | |
| download | syslinux-56973f80f2728d3418b09047a7b023aa3c46e6e2.tar.gz syslinux-56973f80f2728d3418b09047a7b023aa3c46e6e2.tar.xz syslinux-56973f80f2728d3418b09047a7b023aa3c46e6e2.zip | |
Revert "Makefile.private: only delete mk/devel.mk for production releases"syslinux-6.02-pre8
This reverts commit 8dc346bfdc871329624378d4b48db94b40d0b2a4.
Users are reporting a regression caused by this commit, as unlikely as
it seems. Revert in the hope that things will begin working for them
again.
Signed-off-by: Matt Fleming <matt.fleming@intel.com>
| -rw-r--r-- | Makefile.private | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/Makefile.private b/Makefile.private index a0b3c2ae..24905ebc 100644 --- a/Makefile.private +++ b/Makefile.private @@ -18,8 +18,7 @@ .PHONY: official release # These files are removed when tarballs are generated. -PRE_PRIVATE = Makefile.private -REL_PRIVATE = $(PRE_PRIVATE) mk/devel.mk +PRIVATE = Makefile.private mk/devel.mk GIT_DIR ?= .git ABS_GIT_DIR := $(shell cd '$(GIT_DIR)' 2>/dev/null && pwd) @@ -59,7 +58,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 $(REL_PRIVATE) + cd release/syslinux-$(VERSION) && rm -rf $(PRIVATE) cd release && tar cvvf - syslinux-$(VERSION) | \ gzip -9 > syslinux-$(VERSION).tar.gz cd release/syslinux-$(VERSION) && \ @@ -88,7 +87,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 $(PRE_PRIVATE) + cd $(PRERELDIR)/$(PREREL) && rm -rf $(PRIVATE) cd $(PRERELDIR) && tar cvvf - $(PREREL) | \ gzip -9 > $(PREREL).tar.gz cd $(PRERELDIR)/$(PREREL) && \ |