[yocto] [PATCH 1/2] Fix Makefiles

Tue Jan 3 21:28:39 PST 2012

On (28/12/11 14:54), Wang, Shane wrote:
> This patch is to remove DESTDIR in docdir.
> Otherwise, when users install by running `make install DESTDIR=/alternate/directory' specified in the file INSTALL, the doc will go into /alternate/directory/alternate/directory, which is not expected.

DESTDIR is supposed to relocate the install dir why is this wrong ?

> 
> Signed-off-by: Shane Wang <shane.wang at intel.com>
> 
> diff -r 30b597e4e70d Makefile.am
> --- a/Makefile.am	Wed Dec 28 15:38:35 2011 +0800
> +++ b/Makefile.am	Wed Dec 28 15:39:25 2011 +0800
> @@ -7,7 +7,7 @@
>  pkgconfigdir = $(libdir)/pkgconfig
>  pkgconfig_DATA = libomxil-bellagio.pc
>  
> -docdir = $(DESTDIR)$(prefix)/share/doc/@PACKAGE@
> +docdir = $(prefix)/share/doc/@PACKAGE@
>  doc_DATA = README \
>  	   ChangeLog \
>  	   TODO
> 
> --
> Shane
> 
> http://www.yoctoproject.org/ 
> It's not an embedded Linux distribution -
> It creates a custom one for you.

> [0;0mThis patch is to remove DESTDIR in docdir.[0;0m
> [0;0mOtherwise, when users install by running `make install DESTDIR=/alternate/directory' specified in the file INSTALL, the doc will go into /alternate/directory/alternate/directory, which is not expected.[0;0m
> [0;0m[0;0m
> [0;0mSigned-off-by: Shane Wang <shane.wang at intel.com>[0;0m
> [0;0m[0;0m
> [1;32mdiff -r 30b597e4e70d Makefile.am[0;0m
> [1;31m--- a/Makefile.am	Wed Dec 28 15:38:35 2011 +0800[0;0m
> [1;34m+++ b/Makefile.am	Wed Dec 28 15:39:25 2011 +0800[0;0m
> [1;35m@@ -7,7 +7,7 @@[0;0m
> [0;0m pkgconfigdir = $(libdir)/pkgconfig[0;0m
> [0;0m pkgconfig_DATA = libomxil-bellagio.pc[0;0m
> [0;0m [0;0m
> [1;31m-docdir = $(DESTDIR)$(prefix)/share/doc/@PACKAGE@[0;0m
> [1;34m+docdir = $(prefix)/share/doc/@PACKAGE@[0;0m
> [0;0m doc_DATA = README \[0;0m
> [0;0m 	   ChangeLog \[0;0m
> [0;0m 	   TODO[0;0m

> _______________________________________________
> yocto mailing list
> yocto at yoctoproject.org
> https://lists.yoctoproject.org/listinfo/yocto

-- 
-Khem