summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Radestock <matthias@lshift.net>2008-07-14 11:16:07 +0100
committerMatthias Radestock <matthias@lshift.net>2008-07-14 11:16:07 +0100
commit9918ec3c1654318798b3101585752e4df0213ab9 (patch)
tree4305d14c8d30e16d2dae2e8114552d1cbf3b9873
parent59af33d7f86fa9903ec859e9fc7739eab95a032f (diff)
parentbb63114ae61e50aec7ce8f888ad5b2b673016b9d (diff)
downloadrabbitmq-server-9918ec3c1654318798b3101585752e4df0213ab9.tar.gz
merge bug18752 into default
-rw-r--r--.hgignore17
-rw-r--r--Makefile3
2 files changed, 19 insertions, 1 deletions
diff --git a/.hgignore b/.hgignore
new file mode 100644
index 00000000..0781e32f
--- /dev/null
+++ b/.hgignore
@@ -0,0 +1,17 @@
+syntax: glob
+*.beam
+*~
+erl_crash.dump
+
+syntax: regexp
+^cover/
+^dist/
+^include/rabbit_framing.hrl$
+^src/rabbit_framing.erl$
+^rabbit.plt$
+
+^packaging/RPMS/Fedora/(BUILD|RPMS|SOURCES|SPECS|SRPMS)$
+^packaging/debs/Debian/rabbitmq-server_.*\.(dsc|tar\.gz|deb|changes)$
+^packaging/debs/apt-repository/debian$
+^packaging/generic-unix/rabbitmq-server-generic-unix-.*\.tar\.gz$
+^packaging/windows/rabbitmq-server-windows-.*\.zip$
diff --git a/Makefile b/Makefile
index 680003cf..a32a89ea 100644
--- a/Makefile
+++ b/Makefile
@@ -118,7 +118,8 @@ generic_stage:
srcdist: distclean
$(MAKE) VERSION=$(VERSION) GENERIC_STAGE_DIR=dist/$(TARBALL_NAME) generic_stage
- cp -r $(AMQP_CODEGEN_DIR) dist/$(TARBALL_NAME)/codegen
+ mkdir -p dist/$(TARBALL_NAME)/codegen
+ cp -r $(AMQP_CODEGEN_DIR)/* dist/$(TARBALL_NAME)/codegen/.
cp codegen.py Makefile dist/$(TARBALL_NAME)
cp -r scripts dist/$(TARBALL_NAME)