diff options
| author | Måns Rullgård <mans@mansr.com> | 2010-03-06 17:14:13 +0000 |
|---|---|---|
| committer | Måns Rullgård <mans@mansr.com> | 2010-03-06 17:14:13 +0000 |
| commit | fd676deb96b2cc668df37ef5118cabfa75142064 (patch) | |
| tree | 6a66ac2ad105cd9afb1a15e59f8c59e4155a2df0 | |
| parent | b578357e597470667b9bd7e0bd7583dffa205100 (diff) | |
Add INSTALL makefile variable
Originally committed as revision 22242 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | Makefile | 6 | ||||
| -rwxr-xr-x | configure | 1 | ||||
| -rw-r--r-- | subdir.mak | 10 |
3 files changed, 9 insertions, 8 deletions
@@ -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 @@ -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 ed1d68833f..872793488d 100644 --- 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)" \ |