diff options
| author | Emil Velikov <[email protected]> | 2017-03-05 17:17:10 +0000 |
|---|---|---|
| committer | Emil Velikov <[email protected]> | 2017-03-08 16:23:07 +0000 |
| commit | 1fe4d638a16ba6f7ad636986dba03042643c1623 (patch) | |
| tree | a6a1348d7d4f505ebfa38c5c3691b95493698087 /src/gallium/targets/dri | |
| parent | 2f3f5728f7107176783d594bf6faf3112ded5329 (diff) | |
gallium/targets: rework the empty targets removal
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"
Tested-by: Andy Furniss <[email protected]>
Reported-by: Andy Furniss <[email protected]>
Fixes: 1cd4fde053 ("gallium/targets: don't leave an empty target directory(ies)")
Signed-off-by: Emil Velikov <[email protected]>
Diffstat (limited to 'src/gallium/targets/dri')
| -rw-r--r-- | src/gallium/targets/dri/Makefile.am | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/gallium/targets/dri/Makefile.am b/src/gallium/targets/dri/Makefile.am index 4d92f45e421..459459ebed2 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 \ |