summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorRod Whitby <rod@whitby.id.au>2005-07-11 19:12:50 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2005-07-11 19:12:50 +0000
commitbb37e057dd1f4ccde852d619a179d7e7014938f6 (patch)
treea09fb1376aabc6a43af836dd420df43927aca35c /Makefile
parent28267edfc5685c5b433df0b7392178702a900185 (diff)
Made the push targets do an update (and required merge) first
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index f4b3139e3f..464ed3f904 100644
--- 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