har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Create installation directories in the common install-* targets.

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

Originally committed as revision 5036 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Måns Rullgård 2006-02-19 12:44:38 +00:00
parent c2ca19d7f9
commit c7bb67c485
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile
View File

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

4
common.mak
View File

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