[FFmpeg-cvslog] r22241 - in trunk: Makefile subdir.mak
mru
subversion
Sat Mar 6 18:14:11 CET 2010
Author: mru
Date: Sat Mar 6 18:14:11 2010
New Revision: 22241
Log:
Use mkdir -p to create directories
Modified:
trunk/Makefile
trunk/subdir.mak
Modified: trunk/Makefile
==============================================================================
--- trunk/Makefile Sat Mar 6 18:14:08 2010 (r22240)
+++ trunk/Makefile Sat Mar 6 18:14:11 2010 (r22241)
@@ -104,15 +104,15 @@ doc/%.1: doc/%.pod
install: $(INSTALL_TARGETS-yes)
install-progs: $(PROGS) $(INSTALL_PROGS_TARGETS-yes)
- install -d "$(BINDIR)"
+ mkdir -p "$(BINDIR)"
install -c -m 755 $(PROGS) "$(BINDIR)"
install-data: $(DATA_FILES)
- install -d "$(DATADIR)"
+ mkdir -p "$(DATADIR)"
install -m 644 $(DATA_FILES) "$(DATADIR)"
install-man: $(MANPAGES)
- install -d "$(MANDIR)/man1"
+ mkdir -p "$(MANDIR)/man1"
install -m 644 $(MANPAGES) "$(MANDIR)/man1"
uninstall: uninstall-progs uninstall-data uninstall-man
Modified: trunk/subdir.mak
==============================================================================
--- trunk/subdir.mak Sat Mar 6 18:14:08 2010 (r22240)
+++ trunk/subdir.mak Sat Mar 6 18:14:11 2010 (r22241)
@@ -62,7 +62,7 @@ endif
endif
install-lib$(NAME)-shared: $(SUBDIR)$(SLIBNAME)
- install -d "$(SHLIBDIR)"
+ mkdir -p "$(SHLIBDIR)"
install -m 755 $$< "$(SHLIBDIR)/$(SLIBNAME_WITH_VERSION)"
$(STRIP) "$(SHLIBDIR)/$(SLIBNAME_WITH_VERSION)"
cd "$(SHLIBDIR)" && \
@@ -72,13 +72,13 @@ install-lib$(NAME)-shared: $(SUBDIR)$(SL
$(SLIB_INSTALL_EXTRA_CMD)
install-lib$(NAME)-static: $(SUBDIR)$(LIBNAME)
- install -d "$(LIBDIR)"
+ mkdir -p "$(LIBDIR)"
install -m 644 $$< "$(LIBDIR)"
$(LIB_INSTALL_EXTRA_CMD)
install-headers::
- install -d "$(INCINSTDIR)"
- install -d "$(LIBDIR)/pkgconfig"
+ mkdir -p "$(INCINSTDIR)"
+ mkdir -p "$(LIBDIR)/pkgconfig"
install -m 644 $(addprefix "$(SRC_DIR)"/,$(HEADERS)) "$(INCINSTDIR)"
ifdef BUILT_HEADERS
install -m 644 $(addprefix $(SUBDIR),$(BUILT_HEADERS)) "$(INCINSTDIR)"
More information about the ffmpeg-cvslog
mailing list