aboutsummaryrefslogtreecommitdiff
path: root/release/Makefile
diff options
context:
space:
mode:
authorNathan Whitehorn <nwhitehorn@FreeBSD.org>2011-05-18 17:39:28 +0000
committerNathan Whitehorn <nwhitehorn@FreeBSD.org>2011-05-18 17:39:28 +0000
commit0bd47e8362e1eee02d034e0479dd79673ec06bcc (patch)
tree94bb0793c6d8c253bf7d91ad6f827d8c63d26866 /release/Makefile
parent4b7e61167509e9e546c6b0a2958734228956c2ca (diff)
downloadsrc-0bd47e8362e1eee02d034e0479dd79673ec06bcc.tar.gz
src-0bd47e8362e1eee02d034e0479dd79673ec06bcc.zip
As requested by many people, with final prodding from Jason Hall, fix this
so that running make release causes make obj to be run before doing anything. This fixes a bug wherein, when run for the first time, and without -DNOSRC, make release would attempt to recursively tar up the src directory including its own output and enter an infinite loop. While here, make the cross-building stuff work a little more the way it should if only one of TARGET/TARGET_ARCH is specified.
Notes
Notes: svn path=/head/; revision=222074
Diffstat (limited to 'release/Makefile')
-rw-r--r--release/Makefile10
1 files changed, 6 insertions, 4 deletions
diff --git a/release/Makefile b/release/Makefile
index 1dde3b106149..081cdbf75115 100644
--- a/release/Makefile
+++ b/release/Makefile
@@ -25,11 +25,11 @@ PORTSDIR?= /usr/ports
DOCDIR?= /usr/doc
RELNOTES_LANG?= en_US.ISO8859-1
-TARGET_ARCH?= ${MACHINE_ARCH}
-.if ${TARGET_ARCH} == ${MACHINE_ARCH}
TARGET?= ${MACHINE}
+.if ${TARGET} == ${MACHINE}
+TARGET_ARCH?= ${MACHINE_ARCH}
.else
-TARGET?= ${TARGET_ARCH}
+TARGET_ARCH?= ${TARGET}
.endif
IMAKE= ${MAKE} TARGET_ARCH=${TARGET_ARCH} TARGET=${TARGET}
DISTDIR= ${.OBJDIR}/dist
@@ -169,7 +169,9 @@ ftp: packagesystem
mkdir ftp
cp *.txz MANIFEST ftp
-release: obj ${RELEASE_TARGETS}
+release:
+ ${MAKE} -C ${.CURDIR} ${.MAKEFLAGS} obj
+ ${MAKE} -C ${.CURDIR} ${.MAKEFLAGS} ${RELEASE_TARGETS}
clean:
chflags -R noschg ${.OBJDIR}