Create installation directories in the common install-* targets.
authorMåns Rullgård <mans@mansr.com>
Sun, 19 Feb 2006 12:44:38 +0000 (12:44 +0000)
committerMåns Rullgård <mans@mansr.com>
Sun, 19 Feb 2006 12:44:38 +0000 (12:44 +0000)
This is needed for components that override install locations (libpostproc).

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

Makefile
common.mak

index b18921d..f3de82a 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
index 4bc8b11..e09cadd 100644 (file)
@@ -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"