diff options
| author | Ben Hood <0x6e6562@gmail.com> | 2009-01-21 13:00:07 +0000 |
|---|---|---|
| committer | Ben Hood <0x6e6562@gmail.com> | 2009-01-21 13:00:07 +0000 |
| commit | 679373c232c358a2d337e443399a22c5441835db (patch) | |
| tree | 516a796e2614d537271255d855fc12623dc2f8a2 /Makefile | |
| parent | 7875ef690f84f2e422c3c3e5b6cfc0e35bda02d3 (diff) | |
| parent | e1fb7f0e3d89c8431ba5520dff48fe939c072a1c (diff) | |
| download | rabbitmq-server-git-679373c232c358a2d337e443399a22c5441835db.tar.gz | |
Merged v1_5_1 into default
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 7 |
1 files changed, 6 insertions, 1 deletions
@@ -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) |