diff options
| author | Måns Rullgård <mans@mansr.com> | 2006-02-19 12:44:38 +0000 |
|---|---|---|
| committer | Måns Rullgård <mans@mansr.com> | 2006-02-19 12:44:38 +0000 |
| commit | c7bb67c485c7685e2a6634a0ebabbbf9eb2f4747 (patch) | |
| tree | 4667f5afff11e3eaf165d2426e2f0019f8db5473 | |
| parent | c2ca19d7f914c2856b373a088c6d1b5b607b3475 (diff) | |
| download | ffmpeg-c7bb67c485c7685e2a6634a0ebabbbf9eb2f4747.tar.gz | |
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
| -rw-r--r-- | Makefile | 3 | ||||
| -rw-r--r-- | common.mak | 4 |
2 files changed, 4 insertions, 3 deletions
@@ -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 4bc8b118b5..e09cadd0c8 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" |