From 27049f82a538f83232142729c9843de98ba3ccb0 Mon Sep 17 00:00:00 2001 From: mru <mru@9553f0bf-9b14-0410-a0b8-cfaf0461ba5b> Date: Sun, 19 Feb 2006 12:44:38 +0000 Subject: [PATCH] Create installation directories in the common install-* targets. This is needed for components that override install locations (libpostproc). git-svn-id: file:///var/local/repositories/ffmpeg/trunk@5036 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b --- Makefile | 3 --- common.mak | 4 ++++ 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index b18921dfe..f3de82a94 100644 --- a/Makefile +++ b/Makefile @@ -138,7 +138,6 @@ install-vhook: $(MAKE) -C vhook install install-libs: - install -d "$(libdir)" $(MAKE) -C libavutil install-libs $(MAKE) -C libavcodec install-libs $(MAKE) -C libavformat install-libs @@ -150,8 +149,6 @@ ifeq ($(BUILD_SHARED),yes) endif install-headers: - install -d "$(incdir)" - install -d "$(libdir)/pkgconfig" $(MAKE) -C libavutil install-headers $(MAKE) -C libavcodec install-headers $(MAKE) -C libavformat install-headers diff --git a/common.mak b/common.mak index 4bc8b118b..e09cadd0c 100644 --- a/common.mak +++ b/common.mak @@ -71,6 +71,7 @@ install: install-libs install-headers install-libs: $(INSTLIBTARGETS) install-lib-shared: $(SLIBNAME) + install -d "$(libdir)" ifeq ($(CONFIG_WIN32),yes) install $(INSTALLSTRIP) -m 755 $(SLIBNAME) "$(prefix)" else @@ -83,9 +84,12 @@ else endif install-lib-static: $(LIB) + install -d "$(libdir)" install -m 644 $(LIB) "$(libdir)" install-headers: + install -d "$(incdir)" + install -d "$(libdir)/pkgconfig" install -m 644 $(addprefix "$(SRC_DIR)"/,$(HEADERS)) "$(incdir)" install -m 644 $(BUILD_ROOT)/lib$(NAME).pc "$(libdir)/pkgconfig" -- 2.25.4