Re: [PATCH 2/2] Add support for per/OS CP flags

["Fabio M. Di Nitto" <fdinitto@xxxxxxxxxx>]

ACK

On 3/26/2012 11:53 AM, Jan Friesse wrote:
> This is used on platforms, where CP doesn't have -a parameter.
> 
> Signed-off-by: Jan Friesse <jfriesse@xxxxxxxxxx>
> ---
>  configure.ac     |    3 +++
>  exec/Makefile.am |    2 +-
>  lib/Makefile.am  |    2 +-
>  3 files changed, 5 insertions(+), 2 deletions(-)
> 
> diff --git a/configure.ac b/configure.ac
> index 9999fca..550dcb4 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -272,6 +272,7 @@ AC_ARG_ENABLE([snmp],
>  # OS detection
>  # THIS SECTION MUST DIE!
>  CP=cp
> +CP_ARGS="-a"
>  OS_LDL="-ldl"
>  case "$host_os" in
>  	*linux*)
> @@ -322,6 +323,7 @@ case "$host_os" in
>  			*netbsd*)
>  				AC_DEFINE_UNQUOTED([_SEM_SEMUN_UNDEFINED], [1],
>  					   [The semun structure is undefined])
> +				CP_ARGS="-RpP"
>  			;;
>  		esac
>  	;;
> @@ -346,6 +348,7 @@ case "$host_os" in
>  esac
>  
>  AC_SUBST(CP)
> +AC_SUBST(CP_ARGS)
>  # *FLAGS handling goes here
>  
>  ENV_CFLAGS="$CFLAGS"
> diff --git a/exec/Makefile.am b/exec/Makefile.am
> index 1d07d8d..b2b53a2 100644
> --- a/exec/Makefile.am
> +++ b/exec/Makefile.am
> @@ -158,7 +158,7 @@ all-local: $(LCRSO_OBJS) $(LCRSO) $(SHARED_LIBS)
>  install-exec-local:
>  	$(INSTALL) -d $(DESTDIR)/$(libdir)
>  	$(INSTALL) -m 755 $(SHARED_LIBS) $(DESTDIR)/$(libdir)
> -	$(CP) -a $(SHARED_LIBS_SO) $(SHARED_LIBS_SO_TWO) $(DESTDIR)/$(libdir)
> +	$(CP) $(CP_ARGS) $(SHARED_LIBS_SO) $(SHARED_LIBS_SO_TWO) $(DESTDIR)/$(libdir)
>  	$(INSTALL) -d $(DESTDIR)/$(LCRSODIR)
>  	$(INSTALL) -m 755 $(LCRSO) $(DESTDIR)/$(LCRSODIR)
>  
> diff --git a/lib/Makefile.am b/lib/Makefile.am
> index 5b33e24..9bfc24b 100644
> --- a/lib/Makefile.am
> +++ b/lib/Makefile.am
> @@ -129,7 +129,7 @@ all-local: $(get_explicit_sharedlibs) $(SHARED_LIBS_SO)
>  install-exec-local:
>  	$(INSTALL) -d $(DESTDIR)/$(libdir)
>  	$(INSTALL) -m 755 $(get_sharedlibs) $(get_explicit_sharedlibs) $(DESTDIR)/$(libdir)
> -	$(CP) -a $(SHARED_LIBS_SO) $(EXPLICIT_SHARED_LIBS_SO) $(get_sharedlibs_two) $(get_explicit_sharedlibs_two) $(DESTDIR)/$(libdir)
> +	$(CP) $(CP_ARGS) $(SHARED_LIBS_SO) $(EXPLICIT_SHARED_LIBS_SO) $(get_sharedlibs_two) $(get_explicit_sharedlibs_two) $(DESTDIR)/$(libdir)
>  
>  uninstall-local:
>  	cd $(DESTDIR)/$(libdir)/ && \

_______________________________________________
discuss mailing list
discuss@xxxxxxxxxxxx
http://lists.corosync.org/mailman/listinfo/discuss