svn commit: trunk/uClibc/extra/scripts

[Peter Kjellerstedt]

> -----Original Message-----
> From: uclibc-cvs-bounces at uclibc.org 
> [mailto:uclibc-cvs-bounces at uclibc.org] On Behalf Of aldot at uclibc.org
> Sent: Thursday, August 24, 2006 23:40
> To: uclibc-cvs at uclibc.org
> Subject: svn commit: trunk/uClibc/extra/scripts
> 
> Author: aldot
> Date: 2006-08-24 14:39:49 -0700 (Thu, 24 Aug 2006)
> New Revision: 15986
> 
> Log:
> - only link asm-generic if it exists.
>   PS: test for existence on Slowaris was disfunctional, last 
> time i looked. Shouldn't matter much here, though..
> 
> Modified:
>    trunk/uClibc/extra/scripts/fix_includes.sh
> 
> Changeset:
> Modified: trunk/uClibc/extra/scripts/fix_includes.sh
> ===================================================================
> --- trunk/uClibc/extra/scripts/fix_includes.sh	
> 2006-08-24 21:15:57 UTC (rev 15985)
> +++ trunk/uClibc/extra/scripts/fix_includes.sh	
> 2006-08-24 21:39:49 UTC (rev 15986)
> @@ -160,10 +160,10 @@
>  
>  
>  # Annoyingly, 2.6.x kernel headers also need an 
> include/asm-generic/ directory
> -if [ ! -e include/asm-generic ] ; then
>  if [ $VERSION -eq 2 ] && [ $PATCHLEVEL -ge 6 ] ; then
> -    ln -fs $KERNEL_SOURCE/include/asm-generic include/asm-generic
> -fi;
> +	[ ! -e include/asm-generic ] && \
> +		[ -e $KERNEL_SOURCE/include/asm-generic ] && \
> +	ln -fs $KERNEL_SOURCE/include/asm-generic include/asm-generic
>  fi
>  
>  

Wouldn't it be better to do:

	rm -f include/asm-generic; \
	[ -e $KERNEL_SOURCE/include/asm-generic ] && \
		ln -fs $KERNEL_SOURCE/include/asm-generic
include/asm-generic

That way, the link will be correct if $KERNEL_SOURCE has changed 
since the last time we built.  I doubt that this alone will allow 
a correct rebuild without doing make clean after changing 
$KERNEL_SOURCE, but at least it is one problem spot less.

//Peter