Packages are now "self-hosted": no need for the packaging dir

... in the source distribution anymore

9 files changed, 17 insertions, 16 deletions

diff --git a/Makefile b/Makefile
index a325d8ca7b..277ccb1fb6 100644
--- a/Makefile
+++ b/Makefile
@@ -187,6 +187,7 @@ RSYNC_FLAGS += -a $(RSYNC_V)		\
 	       --exclude '.git*'			\
 	       --exclude '$(notdir $(ERLANG_MK_TMP))'	\
 	       --exclude 'ebin'				\
+	       --exclude 'packaging'			\
 	       --exclude 'erl_crash.dump'		\
 	       --exclude 'deps'				\
 	       --exclude '/$(SOURCE_DIST_BASE)-*'	\
@@ -359,11 +360,9 @@ install-windows-docs: install-windows-erlapp
 	$(verbose) elinks -dump -no-references -no-numbering rabbitmq-service.html \
 		> $(DESTDIR)$(WINDOWS_PREFIX)/readme-service.txt
 	$(verbose) rm rabbitmq-service.html
-	$(verbose) cp -a packaging/windows/README-etc $(DESTDIR)$(WINDOWS_PREFIX)/etc/README.txt
 	$(verbose) cp -a docs/rabbitmq.config.example $(DESTDIR)$(WINDOWS_PREFIX)/etc
 	$(verbose) for file in $(DESTDIR)$(WINDOWS_PREFIX)/readme-service.txt \
 	 $(DESTDIR)$(WINDOWS_PREFIX)/LICENSE* $(DESTDIR)$(WINDOWS_PREFIX)/INSTALL \
-	 $(DESTDIR)$(WINDOWS_PREFIX)/etc/README.txt \
 	 $(DESTDIR)$(WINDOWS_PREFIX)/etc/rabbitmq.config.example; do \
 		$(UNIX_TO_DOS) "$$file"; \
 		case "$$file" in \
diff --git a/packaging/common/README b/docs/README-for-packages
index 35a1523ac3..35a1523ac3 100644
--- a/packaging/common/README
+++ b/docs/README-for-packages
diff --git a/packaging/RPMS/Fedora/rabbitmq-server.spec b/packaging/RPMS/Fedora/rabbitmq-server.spec
index 5e2b4e0586..a18c3d10a4 100644
--- a/packaging/RPMS/Fedora/rabbitmq-server.spec
+++ b/packaging/RPMS/Fedora/rabbitmq-server.spec
@@ -25,9 +25,9 @@ scalable implementation of an AMQP broker.
 # We want to install into /usr/lib, even on 64-bit platforms
 %define _rabbit_libdir %{_exec_prefix}/lib/rabbitmq
 %define _rabbit_erllibdir %{_rabbit_libdir}/lib/rabbitmq_server-%{version}
-%define _rabbit_server_ocf packaging/common/rabbitmq-server.ocf
+%define _rabbit_server_ocf scripts/rabbitmq-server.ocf
 %define _plugins_state_dir %{_localstatedir}/lib/rabbitmq/plugins
-%define _rabbit_server_ha_ocf packaging/common/rabbitmq-server-ha.ocf
+%define _rabbit_server_ha_ocf scripts/rabbitmq-server-ha.ocf
 
 
 %define _maindir %{buildroot}%{_rabbit_erllibdir}
@@ -37,7 +37,7 @@ scalable implementation of an AMQP broker.
 %setup -q
 
 %build
-cp packaging/common/README %{_builddir}/rabbitmq-server-%{version}/README
+cp -a docs/README-for-packages %{_builddir}/rabbitmq-server-%{version}/README
 make %{?_smp_mflags} dist manpages
 
 %install
@@ -59,7 +59,7 @@ mkdir -p %{buildroot}%{_sysconfdir}/rabbitmq
 mkdir -p %{buildroot}%{_sbindir}
 sed -e 's|@SU_RABBITMQ_SH_C@|su rabbitmq -s /bin/sh -c|' \
 	-e 's|@STDOUT_STDERR_REDIRECTION@||' \
-	< packaging/common/rabbitmq-script-wrapper \
+	< scripts/rabbitmq-script-wrapper \
 	> %{buildroot}%{_sbindir}/rabbitmqctl
 chmod 0755 %{buildroot}%{_sbindir}/rabbitmqctl
 for script in rabbitmq-server rabbitmq-plugins; do \
diff --git a/packaging/debs/Debian/debian/rules b/packaging/debs/Debian/debian/rules
index 0bee6deadc..053df18115 100755
--- a/packaging/debs/Debian/debian/rules
+++ b/packaging/debs/Debian/debian/rules
@@ -34,7 +34,7 @@ override_dh_auto_install:
 
 	sed -e 's|@SU_RABBITMQ_SH_C@|su rabbitmq -s /bin/sh -c|' \
 		-e 's|@STDOUT_STDERR_REDIRECTION@|> "$$RABBITMQ_LOG_BASE/startup_log" 2> "$$RABBITMQ_LOG_BASE/startup_err"|' \
-		< packaging/common/rabbitmq-script-wrapper \
+		< scripts/rabbitmq-script-wrapper \
 		> $(DEB_DESTDIR)$(PREFIX)/sbin/rabbitmqctl
 	chmod 0755 $(DEB_DESTDIR)$(PREFIX)/sbin/rabbitmqctl
 	for script in rabbitmq-server rabbitmq-plugins; do \
@@ -45,9 +45,9 @@ override_dh_auto_install:
 	install -p -D -m 0644 debian/rabbitmq-server.default \
 		$(DEB_DESTDIR)/etc/default/rabbitmq-server
 
-	install -p -D -m 0755 packaging/common/rabbitmq-server.ocf \
+	install -p -D -m 0755 scripts/rabbitmq-server.ocf \
 		$(DEB_DESTDIR)$(PREFIX)/lib/ocf/resource.d/rabbitmq/rabbitmq-server
-	install -p -D -m 0755 packaging/common/rabbitmq-server-ha.ocf \
+	install -p -D -m 0755 scripts/rabbitmq-server-ha.ocf \
 		$(DEB_DESTDIR)$(PREFIX)/lib/ocf/resource.d/rabbitmq/rabbitmq-server-ha
 
 	rm $(DEB_DESTDIR)$(RMQ_ERLAPP_DIR)/LICENSE* \
diff --git a/packaging/windows/Makefile b/packaging/windows/Makefile
index dba27112fc..3aa8280c6b 100644
--- a/packaging/windows/Makefile
+++ b/packaging/windows/Makefile
@@ -13,6 +13,8 @@ dist:
 	tar -Jxf $(TARBALL_DIR)/$(TARBALL)
 	$(MAKE) -C $(SOURCE_DIR) install-windows DESTDIR=$(abspath $(TARGET_DIR)) WINDOWS_PREFIX=
 
+	cp -a README-etc $(TARGET_DIR)/etc/README.txt
+
 	zip -q -r $(TARGET_ZIP).zip $(TARGET_DIR)
 	rm -rf $(SOURCE_DIR) $(TARGET_DIR)
 
diff --git a/packaging/windows/README-etc b/packaging/windows/README-etc
index 807698e81f..b431247c6b 100644
--- a/packaging/windows/README-etc
+++ b/packaging/windows/README-etc
@@ -1,7 +1,7 @@
-In this directory you can find an example configuration file for RabbitMQ.
-
-Note that this directory is *not* where the real RabbitMQ
-configuration lives. The default location for the real configuration
-file is %APPDATA%\RabbitMQ\rabbitmq.config.
-
-%APPDATA% usually expands to C:\Users\%USERNAME%\AppData\Roaming or similar.
+In this directory you can find an example configuration file for RabbitMQ.

+

+Note that this directory is *not* where the real RabbitMQ

+configuration lives. The default location for the real configuration

+file is %APPDATA%\RabbitMQ\rabbitmq.config.

+

+%APPDATA% usually expands to C:\Users\%USERNAME%\AppData\Roaming or similar.

diff --git a/packaging/common/rabbitmq-script-wrapper b/scripts/rabbitmq-script-wrapper
index ed4c276e53..ed4c276e53 100644
--- a/packaging/common/rabbitmq-script-wrapper
+++ b/scripts/rabbitmq-script-wrapper
diff --git a/packaging/common/rabbitmq-server-ha.ocf b/scripts/rabbitmq-server-ha.ocf
index 5ccda7b745..5ccda7b745 100755..100644
--- a/packaging/common/rabbitmq-server-ha.ocf
+++ b/scripts/rabbitmq-server-ha.ocf
diff --git a/packaging/common/rabbitmq-server.ocf b/scripts/rabbitmq-server.ocf
index 804e65423d..804e65423d 100755..100644
--- a/packaging/common/rabbitmq-server.ocf
+++ b/scripts/rabbitmq-server.ocf