Re: [PATCH 1/2] Revert "Use install instead of cp"

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



ACK

On 3/26/2012 11:53 AM, Jan Friesse wrote:
> This reverts commit 8b06d65b7b1a7b9944aab49daae51b95b4e51a5e.
> 
> Install follows symlinks and creates full copy instead of symlink. This
> is not intended behavior.
> 
> Signed-off-by: Jan Friesse <jfriesse@xxxxxxxxxx>
> ---
>  exec/Makefile.am |    2 +-
>  lib/Makefile.am  |    2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/exec/Makefile.am b/exec/Makefile.am
> index ddb41e1..1d07d8d 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)
> -	$(INSTALL) $(SHARED_LIBS_SO) $(SHARED_LIBS_SO_TWO) $(DESTDIR)/$(libdir)
> +	$(CP) -a $(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 d3e417a..5b33e24 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)
> -	$(INSTALL) $(SHARED_LIBS_SO) $(EXPLICIT_SHARED_LIBS_SO) $(get_sharedlibs_two) $(get_explicit_sharedlibs_two) $(DESTDIR)/$(libdir)
> +	$(CP) -a $(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


[Index of Archives]     [Linux Clusters]     [Corosync Project]     [Linux USB Devel]     [Linux Audio Users]     [Photo]     [Yosemite News]    [Yosemite Photos]    [Linux Kernel]     [Linux SCSI]     [X.Org]

  Powered by Linux