[PATCH 1/3]siliconmotion new driver initial patch 1

[Alan Coopersmith]

On 08/ 6/12 02:43 AM, Aaron.Chen  陈俊杰 wrote:
> Hi,
> 
> We have updated the copyrights and repatched the whole new driver into 3 parts. Here is the first one.
> 
> man/Makefile.am |   21 ++++++++++++++++++---
>  1 files changed, 18 insertions(+), 3 deletions(-)
> 
> diff --git a/man/Makefile.am b/man/Makefile.am
> index e1182ee..c6c85ab 100644
> --- a/man/Makefile.am
> +++ b/man/Makefile.am
> @@ -31,10 +31,25 @@ EXTRA_DIST = @DRIVER_NAME at .man
>  
>  CLEANFILES = $(driverman_DATA)
>  
> -# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
> -
> +SED = sed
> +
> +# Strings to replace in man pages
> +XORGRELSTRING = @PACKAGE_STRING@
> +  XORGMANNAME = X Version 11
> +
> +MAN_SUBSTS = \
> +	-e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
> +	-e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
> +	-e 's|__xservername__|Xorg|g' \
> +	-e 's|__xconfigfile__|xorg.conf|g' \
> +	-e 's|__projectroot__|$(prefix)|g' \
> +	-e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \
> +	-e 's|__drivermansuffix__|$(DRIVER_MAN_SUFFIX)|g' \
> +	-e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \
> +	-e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \
> +	-e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g'
>  
>  SUFFIXES = .$(DRIVER_MAN_SUFFIX) .man
>  
>  .man.$(DRIVER_MAN_SUFFIX):
> -	$(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
> +	sed $(MAN_SUBSTS) < $< > $@

NAK.  This patch removes work done in the tree by others and just shows you're
not merging the changes we made with your work correctly.


-- 
	-Alan Coopersmith-              alan.coopersmith at oracle.com
	 Oracle Solaris Engineering - http://blogs.oracle.com/alanc