[x264-devel] [PATCH 9/9] build: Use '$(INSTALL_DIR)' as alias for '$(INSTALL) -d'

Stephen Hutchinson qyot27 at gmail.com
Sat Apr 26 23:45:23 CEST 2014


Suppresses the echoing of directory-related INSTALL messages when
using silent rules
---
 Makefile  | 10 +++++-----
 configure |  2 ++
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index 929b6b7..2d2874e 100644
--- a/Makefile
+++ b/Makefile
@@ -7,7 +7,7 @@ ifndef V
 Q      = @
 ECHO   = printf "$(1)\t%s\n" $(2)
 BRIEF  = CC AS YASM AR LD STRIP CP RC
-SILENT = RM RANLIB
+SILENT = RM RANLIB INSTALL_DIR
 
 MSG    = $@
 M      = @$(call ECHO,$(TAG),$@);
@@ -263,17 +263,17 @@ distclean: clean
 	$(RM) -f config.mak x264_config.h config.h config.log x264.pc x264.def
 
 install-cli: x264$(EXE)
-	$(INSTALL) -d $(DESTDIR)$(bindir)
+	$(INSTALL_DIR) $(DESTDIR)$(bindir)
 	$(INSTALL) $< $(DESTDIR)$(bindir)
 
 install-lib-dev: install-lib-headers install-lib-pc
 
 install-lib-headers: $(SRCPATH)/x264.h x264_config.h
-	$(INSTALL) -d $(DESTDIR)$(includedir)
+	$(INSTALL_DIR) $(DESTDIR)$(includedir)
 	$(INSTALL) -m 644 $^ $(DESTDIR)$(includedir)
 
 install-lib-pc: x264.pc
-	$(INSTALL) -d $(DESTDIR)$(libdir) $(DESTDIR)$(libdir)/pkgconfig
+	$(INSTALL_DIR) $(DESTDIR)$(libdir) $(DESTDIR)$(libdir)/pkgconfig
 	$(INSTALL) -m 644 $< $(DESTDIR)$(libdir)/pkgconfig
 
 install-lib-static: install-lib-dev install-static
@@ -286,7 +286,7 @@ install-lib-shared: install-lib-dev install-shared install-implib
 
 install-shared: $(SONAME)
 ifneq ($(IMPLIBNAME),)
-	$(INSTALL) -d $(DESTDIR)$(bindir)
+	$(INSTALL_DIR) $(DESTDIR)$(bindir)
 	$(INSTALL) -m 755 $< $(DESTDIR)$(bindir)
 else ifneq ($(SONAME),)
 	$(Q)ln -f -s $< $(DESTDIR)$(libdir)/libx264.$(SOSUFFIX)
diff --git a/configure b/configure
index f54bc78..773678c 100755
--- a/configure
+++ b/configure
@@ -427,6 +427,7 @@ AR="${AR-${cross_prefix}ar}"
 RANLIB="${RANLIB-${cross_prefix}ranlib}"
 STRIP="${STRIP-${cross_prefix}strip}"
 INSTALL="${INSTALL-install}"
+INSTALL_DIR="${INSTALL-install} -d"
 
 if [ "x$host" = x ]; then
     host=`${SRCPATH}/config.guess`
@@ -1170,6 +1171,7 @@ AR=$AR
 RANLIB=$RANLIB
 STRIP=$STRIP
 INSTALL=$INSTALL
+INSTALL_DIR=$INSTALL_DIR
 AS=$AS
 ASFLAGS=$ASFLAGS
 RC=$RC
-- 
1.9.1



More information about the x264-devel mailing list