summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2018-02-20 12:52:24 -0800
committerH. Peter Anvin <hpa@zytor.com>2018-02-20 12:52:24 -0800
commitf6a10743cac102fa44a8a8fa8a7fad3f3656110c (patch)
treeeffc0131bbfcc98cf11a8233a39b3856756370da
parent2d52744538b5dcbbb7f4e0fe33f30fff424b3bfd (diff)
downloadnasmbuild-f6a10743cac102fa44a8a8fa8a7fad3f3656110c.tar.gz
nasmbuild-f6a10743cac102fa44a8a8fa8a7fad3f3656110c.tar.xz
nasmbuild-f6a10743cac102fa44a8a8fa8a7fad3f3656110c.zip
MacOSX: set DESTDIR in additon to INSTALLROOT
NASM 2.14 changed INSTALLROOT to DESTDIR to match GNU standards. Signed-off-by: H. Peter Anvin <hpa@zytor.com>
-rwxr-xr-xbuildall.sh5
1 files changed, 3 insertions, 2 deletions
diff --git a/buildall.sh b/buildall.sh
index 142150b..acfd940 100755
--- a/buildall.sh
+++ b/buildall.sh
@@ -151,8 +151,9 @@ build () {
./configure --host=i686-apple-darwin10
$makej
mv LICENSE README doc/nasmdoc.pdf ../nasm-$version/
- make install INSTALLROOT=`pwd`/../nasm-$version bindir= mandir=
- make install_rdf INSTALLROOT=`pwd`/../nasm-$version bindir= mandir=
+ ir=`pwd`/../nasm-$version
+ make install INSTALLROOT="$ir" DESTDIR="$ir" bindir= mandir=
+ make install_rdf INSTALLROOT="$ir" DESTDIR="$ir" bindir= mandir=
cd ..
zip -9Dr ../nasm-$version-macosx.zip nasm-$version
) > log/macosx 2>&1 &