Add INSTALL makefile variable
authorMåns Rullgård <mans@mansr.com>
Sat, 6 Mar 2010 17:14:13 +0000 (17:14 +0000)
committerMåns Rullgård <mans@mansr.com>
Sat, 6 Mar 2010 17:14:13 +0000 (17:14 +0000)
Originally committed as revision 22242 to svn://svn.ffmpeg.org/ffmpeg/trunk

Makefile
configure
subdir.mak

index 939ebc1..32f9f5f 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
 
index e85e7c2..c028834 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(){
index ed1d688..8727934 100644 (file)
@@ -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)" \