Merge bug24493

Author: Simon MacMullen

Makefile

@@ -22,11 +22,11 @@ clean:
 distclean: clean
 	make -C $(AMQP_CODEGEN_DIR) clean
 
-dist: distclean srcdist dist_all
+dist: distclean srcdist dist_all maven-bundle
 
 dist_all: dist1.5 javadoc-archive
 
-maven-bundle: distclean
+maven-bundle:
 	ant -Dimpl.version=$(VERSION) maven-bundle
 
 dist1.5:
@@ -64,7 +64,7 @@ srcdist: distclean
 	(cd build; zip -q -r $(SRC_ARCHIVE).zip $(SRC_ARCHIVE))
 	(cd build; rm -rf $(SRC_ARCHIVE))
 
-stage-and-promote-maven-bundle: maven-bundle
+stage-and-promote-maven-bundle:
 	( \
 	  cd build/bundle; \
 	  NEXUS_USERNAME=`cat $(GNUPG_PATH)/../nexus/username`; \