diff options
| author | Simon MacMullen <simon@rabbitmq.com> | 2013-09-30 16:48:10 +0100 |
|---|---|---|
| committer | Simon MacMullen <simon@rabbitmq.com> | 2013-09-30 16:48:10 +0100 |
| commit | e49cec5e28556724a1e5e6d6693c4e3a41138b08 (patch) | |
| tree | 767589cb63a4eb18c9c44b2e36db75d07d4f0e5a /packaging | |
| parent | 011da2fb610e16bc7e93683d27d66eca32de4d59 (diff) | |
| parent | 4d3c7c897225ac4637945fbc7da2845ed6f84d9f (diff) | |
| download | rabbitmq-server-git-e49cec5e28556724a1e5e6d6693c4e3a41138b08.tar.gz | |
Merge bug20384
Diffstat (limited to 'packaging')
| -rw-r--r-- | packaging/RPMS/Fedora/rabbitmq-server.spec | 6 | ||||
| -rw-r--r-- | packaging/debs/Debian/debian/rules | 5 | ||||
| -rw-r--r-- | packaging/generic-unix/Makefile | 1 | ||||
| -rw-r--r-- | packaging/standalone/Makefile | 1 | ||||
| -rw-r--r-- | packaging/windows/Makefile | 3 |
5 files changed, 12 insertions, 4 deletions
diff --git a/packaging/RPMS/Fedora/rabbitmq-server.spec b/packaging/RPMS/Fedora/rabbitmq-server.spec index 2df8ee9d5e..d1e3e380c2 100644 --- a/packaging/RPMS/Fedora/rabbitmq-server.spec +++ b/packaging/RPMS/Fedora/rabbitmq-server.spec @@ -46,9 +46,12 @@ make %{?_smp_mflags} %install rm -rf %{buildroot} +# Note that we pass /tmp to DOC_INSTALL_DIR here because we're using %doc +# to actually install rabbitmq.config.example, so this is just a fake/temp path make install TARGET_DIR=%{_maindir} \ SBIN_DIR=%{buildroot}%{_rabbit_libdir}/bin \ - MAN_DIR=%{buildroot}%{_mandir} + MAN_DIR=%{buildroot}%{_mandir} \ + DOC_INSTALL_DIR=/tmp mkdir -p %{buildroot}%{_localstatedir}/lib/rabbitmq/mnesia mkdir -p %{buildroot}%{_localstatedir}/log/rabbitmq @@ -118,6 +121,7 @@ done %{_initrddir}/rabbitmq-server %config(noreplace) %{_sysconfdir}/logrotate.d/rabbitmq-server %doc LICENSE* +%doc docs/rabbitmq.config.example %clean rm -rf %{buildroot} diff --git a/packaging/debs/Debian/debian/rules b/packaging/debs/Debian/debian/rules index ecb778df96..a1498979c3 100644 --- a/packaging/debs/Debian/debian/rules +++ b/packaging/debs/Debian/debian/rules @@ -6,10 +6,9 @@ include /usr/share/cdbs/1/class/makefile.mk RABBIT_LIB=$(DEB_DESTDIR)usr/lib/rabbitmq/lib/rabbitmq_server-$(DEB_UPSTREAM_VERSION)/ RABBIT_BIN=$(DEB_DESTDIR)usr/lib/rabbitmq/bin/ -DEB_MAKE_INSTALL_TARGET := install TARGET_DIR=$(RABBIT_LIB) SBIN_DIR=$(RABBIT_BIN) MAN_DIR=$(DEB_DESTDIR)usr/share/man/ -DEB_MAKE_CLEAN_TARGET:= distclean - 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/ +DEB_MAKE_CLEAN_TARGET:= distclean install/rabbitmq-server:: mkdir -p $(DOCDIR) diff --git a/packaging/generic-unix/Makefile b/packaging/generic-unix/Makefile index b6ef9532ef..84a09a2a70 100644 --- a/packaging/generic-unix/Makefile +++ b/packaging/generic-unix/Makefile @@ -10,6 +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)/etc \ install sed -e 's:^SYS_PREFIX=$$:SYS_PREFIX=\$${RABBITMQ_HOME}:' \ diff --git a/packaging/standalone/Makefile b/packaging/standalone/Makefile index 89ccde9371..3788da99af 100644 --- a/packaging/standalone/Makefile +++ b/packaging/standalone/Makefile @@ -24,6 +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)/etc \ install ## Here we set the RABBITMQ_HOME variable, diff --git a/packaging/windows/Makefile b/packaging/windows/Makefile index 1c22216261..57ed891a39 100644 --- a/packaging/windows/Makefile +++ b/packaging/windows/Makefile @@ -9,6 +9,8 @@ dist: mkdir $(SOURCE_DIR)/sbin mv $(SOURCE_DIR)/scripts/*.bat $(SOURCE_DIR)/sbin + mkdir $(SOURCE_DIR)/etc + cp $(SOURCE_DIR)/docs/rabbitmq.config.example $(SOURCE_DIR)/etc/rabbitmq.config.example rm -rf $(SOURCE_DIR)/scripts rm -rf $(SOURCE_DIR)/codegen* $(SOURCE_DIR)/Makefile $(SOURCE_DIR)/*mk rm -f $(SOURCE_DIR)/README @@ -26,6 +28,7 @@ dist: todos $(TARGET_DIR)/INSTALL todos $(TARGET_DIR)/LICENSE* todos $(TARGET_DIR)/plugins/README.txt + todos $(TARGET_DIR)/etc/rabbitmq.config.example rm -rf $(TARGET_DIR)/plugins-src zip -q -r $(TARGET_ZIP).zip $(TARGET_DIR) rm -rf $(TARGET_DIR) rabbitmq-service.html |