diff options
| author | Diego Biurrun <diego@biurrun.de> | 2006-02-11 19:30:55 +0000 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2006-02-11 19:30:55 +0000 |
| commit | dc2a1ce5c0753de76c623151fa78db6f407c113b (patch) | |
| tree | 4a53dbc79cae665b5e87e96123ade22ced48c370 /libavcodec | |
| parent | 1d67a1d46f4dc8fa5433b37d131290cc21c6824a (diff) | |
Simplify header installation.
Originally committed as revision 4986 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/Makefile | 9 | ||||
| -rw-r--r-- | libavcodec/libpostproc/Makefile | 6 |
2 files changed, 4 insertions, 11 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 777d94c86d..fe178f7c87 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -525,13 +525,8 @@ ifeq ($(CONFIG_PP),yes) endif install-headers: - mkdir -p "$(prefix)/include/ffmpeg" - install -m 644 $(SRC_PATH)/libavcodec/avcodec.h \ - "$(prefix)/include/ffmpeg" - install -m 644 $(SRC_PATH)/libavcodec/dsputil.h \ - "$(prefix)/include/ffmpeg" - install -d "$(libdir)/pkgconfig" - install -m 644 ../libavcodec.pc "$(libdir)/pkgconfig" + install -m 644 avcodec.h dsputil.h "$(incdir)" + install -m 644 $(SRC_PATH)/libavcodec.pc "$(libdir)/pkgconfig" ifeq ($(CONFIG_PP),yes) $(MAKE) -C libpostproc $@ endif diff --git a/libavcodec/libpostproc/Makefile b/libavcodec/libpostproc/Makefile index 2f7ec1a0c0..fe322c6e63 100644 --- a/libavcodec/libpostproc/Makefile +++ b/libavcodec/libpostproc/Makefile @@ -65,10 +65,8 @@ install-lib-static: $(LIB) install -m 644 $(LIB) "$(libdir)" install-headers: - mkdir -p $(prefix)/include/postproc - install -m 644 $(SRC_PATH)/libavcodec/libpostproc/postprocess.h $(prefix)/include/postproc/postprocess.h - install -d $(libdir)/pkgconfig - install -m 644 ../../libpostproc.pc $(libdir)/pkgconfig + install -m 644 $postprocess.h $(prefix)/include/postproc/postprocess.h + install -m 644 $(SRC_PATH)/libpostproc.pc $(libdir)/pkgconfig # |