From b578357e597470667b9bd7e0bd7583dffa205100 Mon Sep 17 00:00:00 2001 From: =?utf8?q?M=C3=A5ns=20Rullg=C3=A5rd?= Date: Sat, 6 Mar 2010 17:14:11 +0000 Subject: [PATCH] Use mkdir -p to create directories Originally committed as revision 22241 to svn://svn.ffmpeg.org/ffmpeg/trunk --- Makefile | 6 +++--- subdir.mak | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 508e1c8..939ebc1 100644 --- a/Makefile +++ b/Makefile @@ -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 diff --git a/subdir.mak b/subdir.mak index 5774c6d..ed1d688 100644 --- a/subdir.mak +++ b/subdir.mak @@ -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)$(SLIBNAME) $(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)" -- 2.7.4