Description: Modify makefiles to prevent re-compilation of server and to set app version
Author: Brian Thomason <brian.thomason@canonical.com>

--- rabbitmq-erlang-client-2.5.0+hg20110623.orig/Makefile
+++ rabbitmq-erlang-client-2.5.0+hg20110623/Makefile
@@ -14,7 +14,7 @@
 # Copyright (c) 2007-2011 VMware, Inc.  All rights reserved.
 #
 
-VERSION=0.0.0
+VERSION=2.5.0
 
 SOURCE_PACKAGE_DIR=$(PACKAGE)-$(VERSION)-src
 SOURCE_PACKAGE_TAR_GZ=$(SOURCE_PACKAGE_DIR).tar.gz
@@ -37,8 +37,8 @@ clean: common_clean
 
 distribution: documentation source_tarball package
 
-%.app: %.app.in $(SOURCES) $(BROKER_DIR)/generate_app
-	escript  $(BROKER_DIR)/generate_app $< $@ $(SOURCE_DIR)
+%.app: %.app.in $(SOURCES) ./common/generate_app
+	escript  ./common/generate_app $< $@ $(SOURCE_DIR)
 	sed -i.save 's/%%VSN%%/$(VERSION)/' $@ && rm $@.save
 
 ###############################################################################
@@ -89,7 +89,7 @@ COPY=cp -pR
 
 $(DIST_DIR)/$(COMMON_PACKAGE_EZ): $(BROKER_DEPS) $(COMMON_PACKAGE).app | $(DIST_DIR)
 	rm -f $@
-	$(MAKE) -C $(BROKER_DIR)
+	#$(MAKE) -C $(BROKER_DIR)
 	rm -rf $(DIST_DIR)/$(COMMON_PACKAGE_DIR)
 	mkdir -p $(DIST_DIR)/$(COMMON_PACKAGE_DIR)/$(INCLUDE_DIR)
 	mkdir -p $(DIST_DIR)/$(COMMON_PACKAGE_DIR)/$(EBIN_DIR)
--- rabbitmq-erlang-client-2.5.0+hg20110623.orig/common.mk
+++ rabbitmq-erlang-client-2.5.0+hg20110623/common.mk
@@ -173,7 +173,7 @@ $(DEPS_DIR)/$(COMMON_PACKAGE_DIR): $(DIS
 
 $(DEPS_FILE): $(SOURCES) $(INCLUDES)
 	rm -f $@
-	echo $(subst : ,:,$(foreach FILE,$^,$(FILE):)) | escript $(BROKER_DIR)/generate_deps $@ $(EBIN_DIR)
+	echo $(subst : ,:,$(foreach FILE,$^,$(FILE):)) | escript ./common/generate_deps $@ $(EBIN_DIR)
 
 $(EBIN_DIR)/%.beam: $(SOURCE_DIR)/%.erl $(INCLUDES) $(DEPS_DIR)/$(COMMON_PACKAGE_DIR) | $(DEPS_FILE)
 	$(LIBS_PATH) erlc $(ERLC_OPTS) $<
