summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTony Garnock-Jones <tonygarnockjones@gmail.com>2010-04-19 11:48:23 +1200
committerTony Garnock-Jones <tonygarnockjones@gmail.com>2010-04-19 11:48:23 +1200
commit87842e22068717f722241804d2da2a0eb7e83070 (patch)
treeec0689e0847dc73a280636348d4e284ce7f2e569
parent95195a20c377e1677464d32ed0aff43813955742 (diff)
parentaeeb9be974bed7af14b852e426c2a43aebea1678 (diff)
downloadrabbitmq-c-github-ask-87842e22068717f722241804d2da2a0eb7e83070.tar.gz
Merge default into amqp_0_9_1
-rw-r--r--debian/librabbitmq-dev.install8
-rw-r--r--debian/librabbitmq.install3
-rwxr-xr-xdebian/rules2
3 files changed, 6 insertions, 7 deletions
diff --git a/debian/librabbitmq-dev.install b/debian/librabbitmq-dev.install
index 093d1f5..b4f0bfd 100644
--- a/debian/librabbitmq-dev.install
+++ b/debian/librabbitmq-dev.install
@@ -1,4 +1,4 @@
-usr/include/*.h
-usr/lib/*.a
-usr/lib/*.la
-usr/lib/*.so
+debian/tmp/usr/include/*.h usr/include
+debian/tmp/usr/lib/*.a usr/lib
+debian/tmp/usr/lib/*.la usr/lib
+debian/tmp/usr/lib/*.so usr/lib
diff --git a/debian/librabbitmq.install b/debian/librabbitmq.install
index 3bd57d5..84bc663 100644
--- a/debian/librabbitmq.install
+++ b/debian/librabbitmq.install
@@ -1,2 +1 @@
-usr/lib/*.so.*
-
+debian/tmp/usr/lib/*.so.* usr/lib
diff --git a/debian/rules b/debian/rules
index 0cd8059..10327f2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,7 +12,7 @@ clean:
install: build install-stamp
install-stamp:
- dh install --sourcedir=debian/tmp
+ dh install
touch install-stamp
binary-arch: install