[Mesa-dev] [PATCH] gallium/targets: rework the empty targets removal

[Andy Furniss]

Emil Velikov wrote:
> From: Emil Velikov <emil.velikov at collabora.com>
>
> Earlier commit added extra tracking and we've attempted to remove the
> vdpau/other folder if empty. V2 of said commit dropped the pipe
> to /dev/null and the explicit "true" override.
>
> Sadly both of those are needed since there's no guarantee that the
> folder will be empty before we [mesa] make install.
>
> Since we're bringing those two back, there's no need to track if we've
> installed anything, and simply do "rm -d foo/ &>/dev/null || true"
>
> Cc: Andy Furniss <adf.lists at gmail.com>
> Reported-by: Andy Furniss <adf.lists at gmail.com>
> Fixes: 1cd4fde053 ("gallium/targets: don't leave an empty target directory(ies)")
> Signed-off-by: Emil Velikov <emil.velikov at collabora.com>

Make install works OK for me with this.

> ---
>  src/gallium/targets/dri/Makefile.am   | 3 +--
>  src/gallium/targets/vdpau/Makefile.am | 3 +--
>  src/gallium/targets/xvmc/Makefile.am  | 3 +--
>  3 files changed, 3 insertions(+), 6 deletions(-)
>
> diff --git a/src/gallium/targets/dri/Makefile.am b/src/gallium/targets/dri/Makefile.am
> index 4d92f45e42..459459ebed 100644
> --- a/src/gallium/targets/dri/Makefile.am
> +++ b/src/gallium/targets/dri/Makefile.am
> @@ -139,12 +139,11 @@ endif
>  # gallium_dri.so in the set of final installed files.
>  install-data-hook:
>  	for i in $(TARGET_DRIVERS); do                                  \
> -		has_drivers=1;                                          \
>  		ln -f $(DESTDIR)$(dridir)/gallium_dri.so                \
>  		      $(DESTDIR)$(dridir)/$${i}_dri.so;                 \
>  	done;                                                           \
>  	$(RM) $(DESTDIR)$(dridir)/gallium_dri.*;                        \
> -	test $${has_drivers} -eq 1 || $(RM) -d $(DESTDIR)$(dridir)
> +	$(RM) -d $(DESTDIR)$(dridir) &>/dev/null || true
>
>  uninstall-hook:
>  	for i in $(TARGET_DRIVERS); do                                  \
> diff --git a/src/gallium/targets/vdpau/Makefile.am b/src/gallium/targets/vdpau/Makefile.am
> index a0f310bc59..cd7ef982aa 100644
> --- a/src/gallium/targets/vdpau/Makefile.am
> +++ b/src/gallium/targets/vdpau/Makefile.am
> @@ -108,7 +108,6 @@ endif
>  install-data-hook:
>  	$(AM_V_GEN)dest_dir=$(DESTDIR)/$(vdpaudir);			\
>  	for i in $(TARGET_DRIVERS); do					\
> -		has_drivers=1;						\
>  		j=libvdpau_gallium.$(LIB_EXT);				\
>  		k=libvdpau_$${i}.$(LIB_EXT);				\
>  		l=$${k}.$(VDPAU_MAJOR).$(VDPAU_MINOR).0;		\
> @@ -122,7 +121,7 @@ install-data-hook:
>  		       $${dest_dir}/$${k};				\
>  	done;								\
>  	$(RM) $${dest_dir}/libvdpau_gallium.*;				\
> -	test $${has_drivers} -eq 1 || $(RM) -d $${dest_dir}
> +	$(RM) -d $${dest_dir} &>/dev/null || true
>
>  uninstall-hook:
>  	for i in $(TARGET_DRIVERS); do					\
> diff --git a/src/gallium/targets/xvmc/Makefile.am b/src/gallium/targets/xvmc/Makefile.am
> index b65a191eab..e29dd6a5ca 100644
> --- a/src/gallium/targets/xvmc/Makefile.am
> +++ b/src/gallium/targets/xvmc/Makefile.am
> @@ -70,7 +70,6 @@ endif
>  install-data-hook:
>  	$(AM_V_GEN)dest_dir=$(DESTDIR)/$(xvmcdir);			\
>  	for i in $(TARGET_DRIVERS); do					\
> -		has_drivers=1;						\
>  		j=libXvMCgallium.$(LIB_EXT);				\
>  		k=libXvMC$${i}.$(LIB_EXT);				\
>  		l=$${k}.$(XVMC_MAJOR).$(XVMC_MINOR).0;			\
> @@ -84,7 +83,7 @@ install-data-hook:
>  		       $${dest_dir}/$${k};				\
>  	done;								\
>  	$(RM) $${dest_dir}/libXvMCgallium.*;				\
> -	test $${has_drivers} -eq 1 || $(RM) -d $${dest_dir}
> +	$(RM) -d $${dest_dir} &>/dev/null || true
>
>  uninstall-hook:
>  	for i in $(TARGET_DRIVERS); do					\
>