Re: [Notion-devel] [PATCH] include $(TOPDIR)/config.mk if it exists

[Arnout E. <no...@bz...>]

Hi,

Spoke to Matthias on IRC and pushed a variation on belows' patch.

Feedback welcome as always! I'm thinking of working towards a new release
again soon, so if anyone has any important issues or bugs, or some time to 
spare to test the latest GIT, that'd be great!

Matthias thanks again for the patches,


Kind regards,

Arnout

On Thu, Jul 12, 2012 at 12:11:01AM +0200, Matthias Lederhofer wrote:
> Please tell me if there is already a way to do this currently.  From
> what I saw in the README and makefiles the way to go is to edit
> system.mk which results in conflicts when pulling.  I've added
> loading of config.mk, if it exists.
> 
> TODO: add to documentation
> ---
>  .gitignore          |    1 +
>  build/system-inc.mk |    2 ++
>  2 files changed, 3 insertions(+)
> 
> diff --git a/.gitignore b/.gitignore
> index a2b1f94..7c5d9ab 100644
> --- a/.gitignore
> +++ b/.gitignore
> @@ -8,6 +8,7 @@ tags
>  *.gcda
>  *.tar.gz
>  .*.swp
> +config.mk
>  exports.[ch]
>  po/*.mo
>  man/*.1
> diff --git a/build/system-inc.mk b/build/system-inc.mk
> index 39a767a..f7ad247 100644
> --- a/build/system-inc.mk
> +++ b/build/system-inc.mk
> @@ -15,4 +15,6 @@ else
>    include $(SYSTEM_MK)
>  endif
>  
> +-include $(TOPDIR)/config.mk
> +
>  include $(TOPDIR)/build/libs.mk
> -- 
> 1.7.10.4
> 
> 
> ------------------------------------------------------------------------------
> Live Security Virtual Conference
> Exclusive live event will cover all the ways today's security and 
> threat landscape has changed and how IT managers can respond. Discussions 
> will include endpoint security, mobile security and the latest in malware 
> threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
> _______________________________________________
> Notion-devel mailing list
> Not...@li...
> https://lists.sourceforge.net/lists/listinfo/notion-devel