Browse Source

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
tags/v0.5
Måns Rullgård 19 years ago
parent
commit
c7bb67c485
2 changed files with 4 additions and 3 deletions
  1. +0
    -3
      Makefile
  2. +4
    -0
      common.mak

+ 0
- 3
Makefile View File

@@ -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


+ 4
- 0
common.mak View 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"



Loading…
Cancel
Save