mir/apparmor
2
0
Fork 0
mirror of https://gitlab.com/apparmor/apparmor synced 2025-08-31 22:35:35 +00:00
Code Issues Releases Wiki Activity

This corrects a couple of build issues on openSUSE, as the version

Browse Source 
of rpm there no longer defines %{_host_vendor}.
This commit is contained in:
Steve Beattie
2010-10-07 15:38:31 -07:00
parent c90b199488
commit 875a06b9d7
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
common/Make.rules
View File

@@ -48,16 +48,21 @@ BUILDDIR=$(shell if [ -d "${TESTBUILDDIR}" ] ; then \
echo "/tmp/${NAME}" ; \ echo "/tmp/${NAME}" ; \
fi ;) fi ;)
endif endif
RPMHOSTVENDOR=$(shell which rpm && rpm --eval "%{_host_vendor}")
ifndef DISTRO ifndef DISTRO
DISTRO=$(shell if [ -f /etc/slackware-version ] ; then \ DISTRO=$(shell if [ -f /etc/slackware-version ] ; then \
echo slackware ; \ echo slackware ; \
elif [ -f /etc/debian_version ] ; then \ elif [ -f /etc/debian_version ] ; then \
echo debian ;\ echo debian ;\
elif [ ${RPMHOSTVENDOR} = "suse" ] ; then \ elif which rpm > /dev/null ; then \
echo suse ;\ if [ "$(rpm --eval '0%{?suse_version}')" != "0" ] ; then \
elif [ ${RPMHOSTVENDOR} = "redhat" ] ; then \ echo suse ;\
echo rhel4 ;\ elif [ "$(rpm --eval '%{_host_vendor}')" = redhat ] ; then \
echo rhel4 ;\
elif [ "$(rpm --eval '0%{?fedora}')" != "0" ] ; then \
echo rhel4 ;\
else \
echo unknown ;\
fi ;\
else \ else \
echo unknown ;\ echo unknown ;\
fi) fi)