From c8da7931f9ca2b49ffd23d28e49040fe6864f31b Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Tue, 9 Jan 2001 23:34:03 +0000
Subject: (upload): addchangelog.pl called before doing the "make install" so
 that new ChangeLog is commited when doing the "make install".

---
 Makefile | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 48f26a5f6..0187d6fb9 100644
--- a/Makefile
+++ b/Makefile
@@ -77,7 +77,14 @@ clean:
 	for i in $(DIRS) rescue; do make -C $$i clean; done
 	find . -name "*~" -o -name ".#*" | xargs rm -f
 
-upload: clean install
+upload: 
+	$(MAKE) clean
+
+#	# done before make install to increment ChangeLog version
+	tools/addchangelog.pl tools/cvslog2changelog.pl | tools/mailchangelog.pl
+
+	$(MAKE) install
+
 	function upload() { rsync -qSavz --verbose --exclude '*~' -e ssh --delete $(ROOTDEST)/$$1/$$2 mandrake@kenobi:/c/cooker/$$1; } ;\
 	upload Mandrake/mdkinst '' ;\
 	upload Mandrake/base compss* ;\
@@ -93,8 +100,6 @@ upload: clean install
 	for i in $(RELEASE_BOOT_IMG); do upload images $$i; done ;\
 	echo
 
-	tools/addchangelog.pl perl-install tools/cvslog2changelog.pl | tools/mailchangelog.pl
-
 upload_sparc:
 	touch /tmp/mdkinst_done
 	cp -a $(ROOTDEST)/images/* $(UPLOAD_SPARC_DEST)/images ; true
-- 
cgit v1.2.1