Fix INSTALL in configure for Solaris systems

diff --git a/Makefile b/Makefile
index a1f122b4afe34ab6ba0dbb570f28c779cd00e23f..f2c8a11e7d02b3224c8a5232333e45bb8849f3d9 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -247,29 +247,29 @@ distclean: clean
        rm -f config.mak x264_config.h config.h config.log x264.pc x264.def
 
 install-cli: cli
-       install -d $(DESTDIR)$(bindir)
-       install x264$(EXE) $(DESTDIR)$(bindir)
+       $(INSTALL) -d $(DESTDIR)$(bindir)
+       $(INSTALL) x264$(EXE) $(DESTDIR)$(bindir)
 
 install-lib-dev:
-       install -d $(DESTDIR)$(includedir)
-       install -d $(DESTDIR)$(libdir)
-       install -d $(DESTDIR)$(libdir)/pkgconfig
-       install -m 644 $(SRCPATH)/x264.h $(DESTDIR)$(includedir)
-       install -m 644 x264_config.h $(DESTDIR)$(includedir)
-       install -m 644 x264.pc $(DESTDIR)$(libdir)/pkgconfig
+       $(INSTALL) -d $(DESTDIR)$(includedir)
+       $(INSTALL) -d $(DESTDIR)$(libdir)
+       $(INSTALL) -d $(DESTDIR)$(libdir)/pkgconfig
+       $(INSTALL) -m 644 $(SRCPATH)/x264.h $(DESTDIR)$(includedir)
+       $(INSTALL) -m 644 x264_config.h $(DESTDIR)$(includedir)
+       $(INSTALL) -m 644 x264.pc $(DESTDIR)$(libdir)/pkgconfig
 
 install-lib-static: lib-static install-lib-dev
-       install -m 644 $(LIBX264) $(DESTDIR)$(libdir)
+       $(INSTALL) -m 644 $(LIBX264) $(DESTDIR)$(libdir)
        $(if $(RANLIB), $(RANLIB) $(DESTDIR)$(libdir)/$(LIBX264))
 
 install-lib-shared: lib-shared install-lib-dev
 ifneq ($(IMPLIBNAME),)
-       install -d $(DESTDIR)$(bindir)
-       install -m 755 $(SONAME) $(DESTDIR)$(bindir)
-       install -m 644 $(IMPLIBNAME) $(DESTDIR)$(libdir)
+       $(INSTALL) -d $(DESTDIR)$(bindir)
+       $(INSTALL) -m 755 $(SONAME) $(DESTDIR)$(bindir)
+       $(INSTALL) -m 644 $(IMPLIBNAME) $(DESTDIR)$(libdir)
 else ifneq ($(SONAME),)
        ln -f -s $(SONAME) $(DESTDIR)$(libdir)/libx264.$(SOSUFFIX)
-       install -m 755 $(SONAME) $(DESTDIR)$(libdir)
+       $(INSTALL) -m 755 $(SONAME) $(DESTDIR)$(libdir)
 endif
 
 uninstall:

diff --git a/configure b/configure
index 07796b1f661d7bc1f4348945a4a3640d00b970bc..3d714a5febd27c4b2ef3e89d0e7174c81f9f0bff 100755 (executable)
--- a/configure
+++ b/configure
@@ -424,6 +424,7 @@ CC="${CC-${cross_prefix}gcc}"
 AR="${AR-${cross_prefix}ar}"
 RANLIB="${RANLIB-${cross_prefix}ranlib}"
 STRIP="${STRIP-${cross_prefix}strip}"
+INSTALL="${INSTALL-install}"
 
 if [ "x$host" = x ]; then
     host=`${SRCPATH}/config.guess`
@@ -530,6 +531,15 @@ case $host_os in
         else
             LDFLAGS="$LDFLAGS /usr/lib/values-xpg6.o"
         fi
+        if test -x /usr/ucb/install ; then
+            INSTALL=/usr/ucb/install
+        elif test -x /usr/bin/ginstall ; then
+            # OpenSolaris
+            INSTALL=/usr/bin/ginstall
+        elif test -x /usr/gnu/bin/install ; then
+            # OpenSolaris
+            INSTALL=/usr/gnu/bin/install
+        fi
         HAVE_GETOPT_LONG=0
         ;;
     *qnx*)
@@ -1136,6 +1146,7 @@ LIBX264=$LIBX264
 AR=$AR
 RANLIB=$RANLIB
 STRIP=$STRIP
+INSTALL=$INSTALL
 AS=$AS
 ASFLAGS=$ASFLAGS
 RC=$RC