[Ffmpeg-cvslog] CVS: ffmpeg Makefile,1.99,1.100 common.mak,1.1,1.2

[Måns Rullgård CVS]

Update of /cvsroot/ffmpeg/ffmpeg
In directory mail:/var2/tmp/cvs-serv9059

Modified Files:
	Makefile common.mak 
Log Message:
Create installation directories in the common install-* targets.
This is needed for components that override install locations (libpostproc).


Index: Makefile
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/Makefile,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -d -r1.99 -r1.100
--- Makefile	13 Feb 2006 14:28:32 -0000	1.99
+++ Makefile	19 Feb 2006 12:44:38 -0000	1.100
@@ -138,7 +138,6 @@
 	$(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 @@
 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: common.mak
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/common.mak,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- common.mak	13 Feb 2006 12:53:25 -0000	1.1
+++ common.mak	19 Feb 2006 12:44:38 -0000	1.2
@@ -71,6 +71,7 @@
 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 @@
 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"