Create installation directories in the common install-* targets.

This is needed for components that override install locations (libpostproc).

Originally committed as revision 5036 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/Makefile b/Makefile
index b18921dfe58d9707cd12521ae5cb24ddeb771c33..f3de82a94a29176ce55f43baf3ae42d14dd9ade9 100644 (file)
--- 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 4bc8b118b54f3f201d3b7c3c8f841f2420c1c6d4..e09cadd0c8600652c3d176108d4d4eea7215f344 100644 (file)
--- 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"