Commit 27049f82 authored by mru's avatar mru

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
parent 9d22236c
...@@ -138,7 +138,6 @@ install-vhook: ...@@ -138,7 +138,6 @@ install-vhook:
$(MAKE) -C vhook install $(MAKE) -C vhook install
install-libs: install-libs:
install -d "$(libdir)"
$(MAKE) -C libavutil install-libs $(MAKE) -C libavutil install-libs
$(MAKE) -C libavcodec install-libs $(MAKE) -C libavcodec install-libs
$(MAKE) -C libavformat install-libs $(MAKE) -C libavformat install-libs
...@@ -150,8 +149,6 @@ ifeq ($(BUILD_SHARED),yes) ...@@ -150,8 +149,6 @@ ifeq ($(BUILD_SHARED),yes)
endif endif
install-headers: install-headers:
install -d "$(incdir)"
install -d "$(libdir)/pkgconfig"
$(MAKE) -C libavutil install-headers $(MAKE) -C libavutil install-headers
$(MAKE) -C libavcodec install-headers $(MAKE) -C libavcodec install-headers
$(MAKE) -C libavformat install-headers $(MAKE) -C libavformat install-headers
......
...@@ -71,6 +71,7 @@ install: install-libs install-headers ...@@ -71,6 +71,7 @@ install: install-libs install-headers
install-libs: $(INSTLIBTARGETS) install-libs: $(INSTLIBTARGETS)
install-lib-shared: $(SLIBNAME) install-lib-shared: $(SLIBNAME)
install -d "$(libdir)"
ifeq ($(CONFIG_WIN32),yes) ifeq ($(CONFIG_WIN32),yes)
install $(INSTALLSTRIP) -m 755 $(SLIBNAME) "$(prefix)" install $(INSTALLSTRIP) -m 755 $(SLIBNAME) "$(prefix)"
else else
...@@ -83,9 +84,12 @@ else ...@@ -83,9 +84,12 @@ else
endif endif
install-lib-static: $(LIB) install-lib-static: $(LIB)
install -d "$(libdir)"
install -m 644 $(LIB) "$(libdir)" install -m 644 $(LIB) "$(libdir)"
install-headers: install-headers:
install -d "$(incdir)"
install -d "$(libdir)/pkgconfig"
install -m 644 $(addprefix "$(SRC_DIR)"/,$(HEADERS)) "$(incdir)" install -m 644 $(addprefix "$(SRC_DIR)"/,$(HEADERS)) "$(incdir)"
install -m 644 $(BUILD_ROOT)/lib$(NAME).pc "$(libdir)/pkgconfig" install -m 644 $(BUILD_ROOT)/lib$(NAME).pc "$(libdir)/pkgconfig"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment