From be2e3039a1bf118c8a13d0f29cffaf19f373b3f9 Mon Sep 17 00:00:00 2001
From: Bastien Guerry <bzg@altern.org>
Date: Mon, 19 Mar 2012 22:37:52 +0100
Subject: [PATCH] Fix Makefile.

There was two problems: fixrelease merged the wrong way (merging
master into maint) and cleanrel tried to clean up files that were
already deleted.
---
 Makefile | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/Makefile b/Makefile
index 1753dd8d4..8a7bde126 100644
--- a/Makefile
+++ b/Makefile
@@ -353,18 +353,15 @@ release:
 	git checkout maint
 	git merge -s recursive -X theirs master
 	UTILITIES/set-version.pl $(TAG)
-	git commit -a -m "Release $(TAG)"
+	git commit -a -m "Major release $(TAG) from master"
 	make relup TAG=$(TAG)
 	make cleanrel
-	rm -rf org-$(TAG)
-	rm -f org-$(TAG)*.zip
-	rm -f org-$(TAG)*.tar.gz
 	make pushreleasetag TAG=$(TAG)
 	git push -f origin maint
 	git checkout master
 	git merge -s ours maint
 	UTILITIES/set-version.pl -a $(TAG)
-	git commit -a -m "Update website to show $(TAG) as current release"
+	git commit -a -m "Bump to version $(TAG) as current release from master"
 	git push
 
 # The following target makes a release, but from the stuff that is on
@@ -379,20 +376,16 @@ release:
 
 fixrelease:
 	git checkout maint
-	git merge -s recursive -X theirs master
 	UTILITIES/set-version.pl $(TAG)
-	git commit -a -m "Release $(TAG)"
+	git commit -a -m "Bugfix release $(TAG) from maint"
 	make relup TAG=$(TAG)
 	make cleanrel
-	rm -rf org-$(TAG)
-	rm org-$(TAG)*.zip
-	rm org-$(TAG)*.tar.gz
 	make pushreleasetag TAG=$(TAG)
 	git push -f origin maint
 	git checkout master
 	git merge -s ours maint
 	UTILITIES/set-version.pl -o $(TAG)
-	git commit -a -m "Update website to show $(TAG) as current release"
+	git commit -a -m "Bump to version $(TAG) as current release from maint"
 	git push
 
 # ~$ make relup only makes sense from orgmode.org server
-- 
2.11.4.GIT