Add INSTALL makefile variable

Originally committed as revision 22242 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/Makefile b/Makefile
index 939ebc1175f1886cbc8575bdfebc04e9751067a7..32f9f5ff92c66c03cc544033fb7ac3720ed42e31 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -105,15 +105,15 @@ install: $(INSTALL_TARGETS-yes)
 
 install-progs: $(PROGS) $(INSTALL_PROGS_TARGETS-yes)
        mkdir -p "$(BINDIR)"
-       install -c -m 755 $(PROGS) "$(BINDIR)"
+       $(INSTALL) -c -m 755 $(PROGS) "$(BINDIR)"
 
 install-data: $(DATA_FILES)
        mkdir -p "$(DATADIR)"
-       install -m 644 $(DATA_FILES) "$(DATADIR)"
+       $(INSTALL) -m 644 $(DATA_FILES) "$(DATADIR)"
 
 install-man: $(MANPAGES)
        mkdir -p "$(MANDIR)/man1"
-       install -m 644 $(MANPAGES) "$(MANDIR)/man1"
+       $(INSTALL) -m 644 $(MANPAGES) "$(MANDIR)/man1"
 
 uninstall: uninstall-progs uninstall-data uninstall-man
 

diff --git a/configure b/configure
index e85e7c2c5fd60b62ccfbc38be1b9219de93e1589..c028834ae01bb45131c37e69b796a27c0c994dfd 100755 (executable)
--- a/configure
+++ b/configure
@@ -3005,6 +3005,7 @@ SDL_LIBS=$sdl_libs
 SDL_CFLAGS=$sdl_cflags
 LIB_INSTALL_EXTRA_CMD=$LIB_INSTALL_EXTRA_CMD
 EXTRALIBS=$extralibs
+INSTALL=install
 EOF
 
 get_version(){

diff --git a/subdir.mak b/subdir.mak
index ed1d68833fd8b209392cb3565fca02be4433535a..872793488dfc042ebf122d9adaf664bebb4e8d2a 100644 (file)
--- a/subdir.mak
+++ b/subdir.mak
@@ -63,7 +63,7 @@ endif
 
 install-lib$(NAME)-shared: $(SUBDIR)$(SLIBNAME)
        mkdir -p "$(SHLIBDIR)"
-       install -m 755 $$< "$(SHLIBDIR)/$(SLIBNAME_WITH_VERSION)"
+       $$(INSTALL) -m 755 $$< "$(SHLIBDIR)/$(SLIBNAME_WITH_VERSION)"
        $(STRIP) "$(SHLIBDIR)/$(SLIBNAME_WITH_VERSION)"
        cd "$(SHLIBDIR)" && \
                $(LN_S) $(SLIBNAME_WITH_VERSION) $(SLIBNAME_WITH_MAJOR)
@@ -73,17 +73,17 @@ install-lib$(NAME)-shared: $(SUBDIR)$(SLIBNAME)
 
 install-lib$(NAME)-static: $(SUBDIR)$(LIBNAME)
        mkdir -p "$(LIBDIR)"
-       install -m 644 $$< "$(LIBDIR)"
+       $$(INSTALL) -m 644 $$< "$(LIBDIR)"
        $(LIB_INSTALL_EXTRA_CMD)
 
 install-headers::
        mkdir -p "$(INCINSTDIR)"
        mkdir -p "$(LIBDIR)/pkgconfig"
-       install -m 644 $(addprefix "$(SRC_DIR)"/,$(HEADERS)) "$(INCINSTDIR)"
+       $$(INSTALL) -m 644 $(addprefix "$(SRC_DIR)"/,$(HEADERS)) "$(INCINSTDIR)"
 ifdef BUILT_HEADERS
-       install -m 644 $(addprefix $(SUBDIR),$(BUILT_HEADERS)) "$(INCINSTDIR)"
+       $$(INSTALL) -m 644 $(addprefix $(SUBDIR),$(BUILT_HEADERS)) "$(INCINSTDIR)"
 endif
-       install -m 644 $(BUILD_ROOT)/lib$(NAME)/lib$(NAME).pc "$(LIBDIR)/pkgconfig"
+       $$(INSTALL) -m 644 $(BUILD_ROOT)/lib$(NAME)/lib$(NAME).pc "$(LIBDIR)/pkgconfig"
 
 uninstall-libs::
        -$(RM) "$(SHLIBDIR)/$(SLIBNAME_WITH_MAJOR)" \