]> git.openpandora.org Git - openembedded.git/commitdiff
Made the push targets do an update (and required merge) first
authorRod Whitby <rod@whitby.id.au>
Mon, 11 Jul 2005 19:12:50 +0000 (19:12 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 11 Jul 2005 19:12:50 +0000 (19:12 +0000)
Makefile

index f4b3139e3fe8ff740057b97415a513b9b2b6dd36..464ed3f90453e58f68c9288a314709d46954d1ae 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -137,11 +137,11 @@ clobber-optware:
 # Targets for use by those with write access to the repositories
 
 .PHONY: push-master
-push-master: MT/revision
+push-master: update-master
        monotone push
 
 .PHONY: push-openembedded
-push-openembedded: openembedded/conf/machine/nslu2.conf
+push-openembedded: update-openembedded
        ( cd openembedded ; monotone push )
 
 # Targets for use by core team members only