mir/apparmor
2
0
Fork 0
mirror of https://gitlab.com/apparmor/apparmor synced 2025-08-29 13:28:19 +00:00
Code Issues Releases Wiki Activity

Finally got the right set of in-place variable replacements that strips

Browse Source 
off trailing slashes on the build directory, which horribly confused
rpm's check for unpackaged files.
This commit is contained in:
Steve Beattie 2007-01-11 21:55:08 +00:00
parent eb5dccfa34
commit 08e94e2969
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
common/Make.rules
View File

@ -37,9 +37,7 @@ VERSION=2.0.1
# location -- it *should* pick out the right thing to do based on the # location -- it *should* pick out the right thing to do based on the
# .rpmmacros file, but you can still use BUILDDIR to override that. # .rpmmacros file, but you can still use BUILDDIR to override that.
TESTBUILDDIR=$(shell [ -f ${HOME}/.rpmmacros ] && awk '/^%_topdir/ {print $$2}' ${HOME}/.rpmmacros) TESTBUILDDIR=$(shell [ -f ${HOME}/.rpmmacros ] && awk '/^%_topdir/ {print $$2}' ${HOME}/.rpmmacros)
ifdef BUILDDIR ifndef BUILDDIR
#BUILDDIR:=$(BUILDDIR,/=)
else
BUILDDIR=$(shell if [ -d "${TESTBUILDDIR}" ] ; then \ BUILDDIR=$(shell if [ -d "${TESTBUILDDIR}" ] ; then \
echo ${TESTBUILDDIR} | sed "s^/$$^^" ; \ echo ${TESTBUILDDIR} | sed "s^/$$^^" ; \
elif [ -d "/usr/src/redhat" ] ; then \ elif [ -d "/usr/src/redhat" ] ; then \
@ -64,12 +62,12 @@ DISTRO=$(shell if [ -f /etc/slackware-version ] ; then \
echo unknown ;\ echo unknown ;\
fi) fi)
endif endif
RPMARG=--define "_topdir ${BUILDDIR}" \ RPMARG=--define "_topdir $(BUILDDIR:/=)" \
--define "vendor NOVELL, Inc." \ --define "vendor NOVELL, Inc." \
--define "distribution ${DISTRIBUTION}" \ --define "distribution ${DISTRIBUTION}" \
--define "debug_package %{nil}" \ --define "debug_package %{nil}" \
--define "immunix_version ${VERSION}" \ --define "immunix_version ${VERSION}" \
$(shell [ -d ${BUILDDIR}/BUILDROOT ] && echo --define \"buildroot ${BUILDDIR}/BUILDROOT\") \ $(shell [ -d ${BUILDDIR}/BUILDROOT ] && echo --define \"buildroot $(BUILDDIR:/=)/BUILDROOT\") \
$(shell [ -n "${DISTRO}" ] && echo --define \"distro ${DISTRO}\") $(shell [ -n "${DISTRO}" ] && echo --define \"distro ${DISTRO}\")
#REPO_VERSION=$(shell if [ -x /usr/bin/svn ] ; then \ #REPO_VERSION=$(shell if [ -x /usr/bin/svn ] ; then \
@ -104,7 +102,7 @@ CVSPKG_VERSION=$(shell rpm -q --specfile --define "_sourcedir ." ${RPMARG} ${SPE
RPMSUBDIRS=SOURCES SPECS BUILD BUILDROOT SRPMS RPMS/i386 RPMS/i586 \ RPMSUBDIRS=SOURCES SPECS BUILD BUILDROOT SRPMS RPMS/i386 RPMS/i586 \
RPMS/i686 RPMS/athlon RPMS/noarch RPMS/x86_64 RPMS/i686 RPMS/athlon RPMS/noarch RPMS/x86_64
BUILDRPMSUBDIRS=$(foreach subdir, $(RPMSUBDIRS), $(BUILDDIR)/$(subdir)) BUILDRPMSUBDIRS=$(foreach subdir, $(RPMSUBDIRS), $(BUILDDIR:/=)/$(subdir))
.PHONY: cvs_tag .PHONY: cvs_tag
cvs_tag: cvs_tag: