summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile7
1 files changed, 6 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index fede89e186..83223667dc 100644
--- a/Makefile
+++ b/Makefile
@@ -127,10 +127,15 @@ srcdist: distclean
cp INSTALL.in $(TARGET_SRC_DIR)/INSTALL
elinks -dump -no-references -no-numbering $(WEB_URL)install.html \
>> $(TARGET_SRC_DIR)/INSTALL
- cp BUILD.in $(TARGET_SRC_DIR)/BUILD
+ cp README.in $(TARGET_SRC_DIR)/README
elinks -dump -no-references -no-numbering $(WEB_URL)build-server.html \
+<<<<<<< local
>> $(TARGET_SRC_DIR)/BUILD
sed -i 's/%%VERSION%%/$(VERSION)/' $(TARGET_SRC_DIR)/ebin/rabbit_app.in
+=======
+ >> $(TARGET_SRC_DIR)/README
+ sed -i 's/%%VERSION%%/$(VERSION)/' $(TARGET_SRC_DIR)/ebin/rabbit.app
+>>>>>>> other
cp -r $(AMQP_CODEGEN_DIR)/* $(TARGET_SRC_DIR)/codegen/
cp codegen.py Makefile $(TARGET_SRC_DIR)