From fd676deb96b2cc668df37ef5118cabfa75142064 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A5ns=20Rullg=C3=A5rd?= Date: Sat, 6 Mar 2010 17:14:13 +0000 Subject: Add INSTALL makefile variable Originally committed as revision 22242 to svn://svn.ffmpeg.org/ffmpeg/trunk --- subdir.mak | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'subdir.mak') 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)" \ -- cgit v1.2.1