summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2001-01-09 23:34:03 +0000
committerPascal Rigaux <pixel@mandriva.com>2001-01-09 23:34:03 +0000
commitc8da7931f9ca2b49ffd23d28e49040fe6864f31b (patch)
tree772d85fa750bd90dda9eb9e64943aa6e0b1f914b
parent6cfd26b5663aad89ab1d920f702e3f787c0803a9 (diff)
downloaddrakx-backup-do-not-use-c8da7931f9ca2b49ffd23d28e49040fe6864f31b.tar
drakx-backup-do-not-use-c8da7931f9ca2b49ffd23d28e49040fe6864f31b.tar.gz
drakx-backup-do-not-use-c8da7931f9ca2b49ffd23d28e49040fe6864f31b.tar.bz2
drakx-backup-do-not-use-c8da7931f9ca2b49ffd23d28e49040fe6864f31b.tar.xz
drakx-backup-do-not-use-c8da7931f9ca2b49ffd23d28e49040fe6864f31b.zip
(upload): addchangelog.pl called before doing the "make install" so that
new ChangeLog is commited when doing the "make install".
-rw-r--r--Makefile11
1 files changed, 8 insertions, 3 deletions
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