Merge pull request #905 from benpicco/improve_Makefile.git

improve Makefile.git
RIOT-OS · Mar 19, 2014 · 69515ed · 69515ed
2 parents 8c6f9b1 + ab4d151
commit 69515ed
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/pkg/Makefile.git b/pkg/Makefile.git
@@ -20,11 +20,11 @@ patch: $(CURDIR)/$(PKG_NAME)/Makefile
 
 $(CURDIR)/$(PKG_NAME)/Makefile: $(CURDIR)/$(PKG_NAME)
 	# Here you apply your patch.
-	$(foreach patch,$(shell ls [0-9][0-9][0-9][0-9]*.patch),cd "$<" && git am "$(patch)";)
+	$(foreach patch,$(shell ls [0-9][0-9][0-9][0-9]*.patch),cd "$<" && git am "$(patch)" || { git am --abort; exit 1; };)
 
-$(PKG_NAME)/:
+$(PKG_NAME):
 	# Get PKG_VERSION of package from PKG_URL
-	git clone $(PKG_URL) $(PKG_NAME) && cd $(PKG_NAME) && git checkout $(PKG_VERSION)
+	git clone $(PKG_URL) $(PKG_NAME) && cd $(PKG_NAME) && git reset --hard $(PKG_VERSION)
 
 clean::
 	# Reset package to checkout state.