Build: Officially support Ninja
diff --git a/BUILDING.md b/BUILDING.md
index b5106ee..f91abcd 100644
--- a/BUILDING.md
+++ b/BUILDING.md
@@ -103,6 +103,13 @@
directory. For in-tree builds, these directories are the same.
+Ninja
+-----
+
+In all of the procedures and recipes below, replace `make` with `ninja` and
+`Unix Makefiles` with `Ninja` if using Ninja.
+
+
Build Procedure
---------------
diff --git a/release/makedpkg.in b/release/makedpkg.in
index a7ff7c2..0b7b7e7 100755
--- a/release/makedpkg.in
+++ b/release/makedpkg.in
@@ -67,7 +67,7 @@
mkdir $TMPDIR/DEBIAN
if [ $SUPPLEMENT = 1 ]; then
- make install DESTDIR=$TMPDIR
+ DESTDIR=$TMPDIR @CMAKE_MAKE_PROGRAM@ install
rm -rf $TMPDIR$BINDIR
if [ "$DATAROOTDIR" != "$PREFIX" ]; then
rm -rf $TMPDIR$DATAROOTDIR
@@ -79,7 +79,7 @@
rm -rf $TMPDIR$INCLUDEDIR
rm -rf $TMPDIR$MANDIR
else
- make install DESTDIR=$TMPDIR
+ DESTDIR=$TMPDIR @CMAKE_MAKE_PROGRAM@ install
if [ "$PREFIX" = "@CMAKE_INSTALL_DEFAULT_PREFIX@" -a "$DOCDIR" = "@CMAKE_INSTALL_DEFAULT_PREFIX@/doc" ]; then
safedirmove $TMPDIR/$DOCDIR $TMPDIR/usr/share/doc/$PKGNAME-$VERSION $TMPDIR/__tmpdoc
ln -fs /usr/share/doc/$DIRNAME-$VERSION $TMPDIR$DOCDIR
diff --git a/release/makemacpkg.in b/release/makemacpkg.in
index 36505b9..c87d339 100755
--- a/release/makemacpkg.in
+++ b/release/makemacpkg.in
@@ -90,7 +90,7 @@
PKGROOT=$TMPDIR/pkg/Package_Root
mkdir -p $PKGROOT
-make install DESTDIR=$PKGROOT
+DESTDIR=$PKGROOT @CMAKE_MAKE_PROGRAM@ install
if [ "$PREFIX" = "@CMAKE_INSTALL_DEFAULT_PREFIX@" -a "$DOCDIR" = "@CMAKE_INSTALL_DEFAULT_PREFIX@/doc" ]; then
mkdir -p $PKGROOT/Library/Documentation
@@ -109,13 +109,13 @@
echo ERROR: $ARCHNAME build directory $BUILDDIR does not exist
exit 1
fi
- if [ ! -f $BUILDDIR/Makefile ]; then
+ if [ ! -f $BUILDDIR/Makefile -a ! -f $BUILDDIR/build.ninja ]; then
echo ERROR: $ARCHNAME build directory $BUILDDIR is not configured
exit 1
fi
mkdir -p $TMPDIR/dist.$DIRNAME
pushd $BUILDDIR
- make install DESTDIR=$TMPDIR/dist.$DIRNAME
+ DESTDIR=$TMPDIR/dist.$DIRNAME @CMAKE_MAKE_PROGRAM@ install
popd
$LIPO -create \
$PKGROOT/$LIBDIR/$LIBJPEG_DSO_NAME \
diff --git a/release/maketarball.in b/release/maketarball.in
index 00a9c7e..e2bbe66 100755
--- a/release/maketarball.in
+++ b/release/maketarball.in
@@ -32,7 +32,7 @@
TMPDIR=`mktemp -d /tmp/$PKGNAME-build.XXXXXX`
mkdir -p $TMPDIR/install
-make install DESTDIR=$TMPDIR/install
+DESTDIR=$TMPDIR/install @CMAKE_MAKE_PROGRAM@ install
echo tartest >$TMPDIR/tartest
GNUTAR=0
BSDTAR=0
diff --git a/release/rpm.spec.in b/release/rpm.spec.in
index 05410a6..7274ea6 100644
--- a/release/rpm.spec.in
+++ b/release/rpm.spec.in
@@ -102,7 +102,7 @@
%install
rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
+DESTDIR=$RPM_BUILD_ROOT @CMAKE_MAKE_PROGRAM@ install
/sbin/ldconfig -n $RPM_BUILD_ROOT%{_libdir}
#-->%if 0
