summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Watson <tim@rabbitmq.com>2013-09-18 14:44:52 +0100
committerTim Watson <tim@rabbitmq.com>2013-09-18 14:44:52 +0100
commit8db41c4bc6ccdf77f1ed8df8a1911d3b4d7760b3 (patch)
tree93edacd9206733468b5693d9c32f875569c5b2ae
parentb70331dd0e131c874465e805873a86318d4fd9d4 (diff)
downloadrabbitmq-server-8db41c4bc6ccdf77f1ed8df8a1911d3b4d7760b3.tar.gz
relocate sample config on generic-unix/standalone
-rw-r--r--packaging/debs/Debian/debian/rules1
-rw-r--r--packaging/generic-unix/Makefile2
-rw-r--r--packaging/standalone/Makefile2
3 files changed, 2 insertions, 3 deletions
diff --git a/packaging/debs/Debian/debian/rules b/packaging/debs/Debian/debian/rules
index b9de9041..a1498979 100644
--- a/packaging/debs/Debian/debian/rules
+++ b/packaging/debs/Debian/debian/rules
@@ -8,7 +8,6 @@ RABBIT_BIN=$(DEB_DESTDIR)usr/lib/rabbitmq/bin/
DOCDIR=$(DEB_DESTDIR)usr/share/doc/rabbitmq-server/
DEB_MAKE_INSTALL_TARGET := install TARGET_DIR=$(RABBIT_LIB) SBIN_DIR=$(RABBIT_BIN) DOC_INSTALL_DIR=$(DOCDIR) MAN_DIR=$(DEB_DESTDIR)usr/share/man/
-MAN_DIR=$(DEB_DESTDIR)usr/share/man/
DEB_MAKE_CLEAN_TARGET:= distclean
install/rabbitmq-server::
diff --git a/packaging/generic-unix/Makefile b/packaging/generic-unix/Makefile
index 202234eb..84a09a2a 100644
--- a/packaging/generic-unix/Makefile
+++ b/packaging/generic-unix/Makefile
@@ -10,7 +10,7 @@ dist:
TARGET_DIR=`pwd`/$(TARGET_DIR) \
SBIN_DIR=`pwd`/$(TARGET_DIR)/sbin \
MAN_DIR=`pwd`/$(TARGET_DIR)/share/man \
- DOC_INSTALL_DIR=`pwd`/$(TARGET_DIR)/share/doc/rabbitmq-server \
+ DOC_INSTALL_DIR=`pwd`/$(TARGET_DIR)/etc \
install
sed -e 's:^SYS_PREFIX=$$:SYS_PREFIX=\$${RABBITMQ_HOME}:' \
diff --git a/packaging/standalone/Makefile b/packaging/standalone/Makefile
index f5da249e..3788da99 100644
--- a/packaging/standalone/Makefile
+++ b/packaging/standalone/Makefile
@@ -24,7 +24,7 @@ dist:
TARGET_DIR=`pwd`/$(TARGET_DIR) \
SBIN_DIR=`pwd`/$(TARGET_DIR)/sbin \
MAN_DIR=`pwd`/$(TARGET_DIR)/share/man \
- DOC_INSTALL_DIR=`pwd`/$(TARGET_DIR)/share/doc/rabbitmq-server \
+ DOC_INSTALL_DIR=`pwd`/$(TARGET_DIR)/etc \
install
## Here we set the RABBITMQ_HOME variable,