root
/
rabbitmq-server
mirror of https://github.com/rabbitmq/rabbitmq-server.git
1
0
Fork 0
Code Issues Actions 9 Packages Projects Releases Wiki Activity

Reset `DEPS_DIR` inside Debian and RPM package files 

Our packaging Makefiles already take care of not exporting `DEPS_DIR`.
This is to make sure a user setting (eg. `DEPS_DIR` set globally in the
environment) doesn't break the package build either.
This commit is contained in:
Jean-Sébastien Pédron 2016-09-28 17:34:18 +02:00
parent 892d40a762
commit aa211a1c7b
No known key found for this signature in database
GPG Key ID: 39E99761A5FD94CC
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packaging/RPMS/Fedora/rabbitmq-server.spec
View File

@ -51,12 +51,12 @@ RabbitMQ is an open source multi-protocol messaging broker.
%build
cp -a deps/rabbit/docs/README-for-packages %{_builddir}/rabbitmq-server-%{version}/README
make %{?_smp_mflags} dist manpages
env -u DEPS_DIR make %{?_smp_mflags} dist manpages
%install
rm -rf %{buildroot}
make install install-bin install-man DESTDIR=%{buildroot} PREFIX=%{_exec_prefix} RMQ_ROOTDIR=%{_rabbit_libdir} MANDIR=%{_mandir}
env -u DEPS_DIR make install install-bin install-man DESTDIR=%{buildroot} PREFIX=%{_exec_prefix} RMQ_ROOTDIR=%{_rabbit_libdir} MANDIR=%{_mandir}
mkdir -p %{buildroot}%{_localstatedir}/lib/rabbitmq/mnesia
mkdir -p %{buildroot}%{_localstatedir}/log/rabbitmq

2
packaging/debs/Debian/debian/rules
View File

@ -7,6 +7,8 @@
DEB_DESTDIR = debian/rabbitmq-server
VERSION = $(shell dpkg-parsechangelog | awk '/^Version:/ {version=$$0; sub(/Version: /, "", version); sub(/-.*/, "", version); print version;}')
unexport DEPS_DIR
%:
dh $@ --parallel --with systemd