diff options
| author | Hubert Plociniczak <hubert@lshift.net> | 2009-01-06 13:28:03 +0100 |
|---|---|---|
| committer | Hubert Plociniczak <hubert@lshift.net> | 2009-01-06 13:28:03 +0100 |
| commit | 52e5215f0935540238037d02239d0afb4e713af7 (patch) | |
| tree | 0369c6242eae0b8383ba587e737a13bf640b03d4 | |
| parent | 024f3ea569c94a2b967644d5d51a0f2acf99d4d5 (diff) | |
| download | rabbitmq-server-git-52e5215f0935540238037d02239d0afb4e713af7.tar.gz | |
Define standard libdir macro in the makefile instead of overwriting it directly in the spec file for RPMS. This is to fix the wrong libdir macro under debian for x86_64 architectures.
| -rw-r--r-- | packaging/RPMS/Fedora/Makefile | 4 | ||||
| -rw-r--r-- | packaging/RPMS/Fedora/rabbitmq-server.spec | 10 |
2 files changed, 4 insertions, 10 deletions
diff --git a/packaging/RPMS/Fedora/Makefile b/packaging/RPMS/Fedora/Makefile index c05f14a7cb..aa8c93c6b0 100644 --- a/packaging/RPMS/Fedora/Makefile +++ b/packaging/RPMS/Fedora/Makefile @@ -20,8 +20,8 @@ prepare: server: prepare rpmbuild -ba SPECS/rabbitmq-server.spec $(DEFINES) --target i386 - rpmbuild -ba SPECS/rabbitmq-server.spec $(DEFINES) --define '_arch x86_64' \ - --define '_defaultdocdir /usr/share/doc' --target x86_64 + rpmbuild -ba SPECS/rabbitmq-server.spec $(DEFINES) --define '_libdir /usr/lib64' \ + --define '_arch x86_64' --define '_defaultdocdir /usr/share/doc' --target x86_64 clean: rm -rf SOURCES SPECS RPMS SRPMS BUILD tmp diff --git a/packaging/RPMS/Fedora/rabbitmq-server.spec b/packaging/RPMS/Fedora/rabbitmq-server.spec index 13cfb0372e..36ad864bb5 100644 --- a/packaging/RPMS/Fedora/rabbitmq-server.spec +++ b/packaging/RPMS/Fedora/rabbitmq-server.spec @@ -25,14 +25,8 @@ RabbitMQ is an implementation of AMQP, the emerging standard for high performance enterprise messaging. The RabbitMQ server is a robust and scalable implementation of an AMQP broker. -%ifarch x86_64 - %define _defaultlibdir /usr/lib64 -%else - %define _defaultlibdir /usr/lib -%endif - -%define _erllibdir %{_defaultlibdir}/erlang/lib -%define _rabbitbindir %{_defaultlibdir}/rabbitmq/bin +%define _erllibdir %{_libdir}/erlang/lib +%define _rabbitbindir %{_libdir}/rabbitmq/bin %define _maindir %{buildroot}%{_erllibdir}/rabbitmq_server-%{version} |