From b8cfb0dc8426754b477b561bc158b8a24c143ddf Mon Sep 17 00:00:00 2001 From: Gaetan Nadon Date: Sat, 28 Sep 2013 15:26:36 -0400 Subject: [PATCH] Uninstall X link and CYGWIN libXorg.exe.a in local install targets It is our duty to uninstall any files and/or directories that we installed through install-data-local and install-exec-hook. Currently the X symbolic link to Xorg remains on disk after running make uninstall. Note the exception for logdir which is usually shared by other modules. Reviewed-By: Matt Dew Signed-off-by: Gaetan Nadon Signed-off-by: Keith Packard --- hw/xfree86/Makefile.am | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/hw/xfree86/Makefile.am b/hw/xfree86/Makefile.am index 4b0edeb2e..3410e4a8b 100644 --- a/hw/xfree86/Makefile.am +++ b/hw/xfree86/Makefile.am @@ -98,6 +98,14 @@ if INSTALL_SETUID chmod u+s $(DESTDIR)$(bindir)/Xorg endif +uninstall-local: +if CYGWIN + $(AM_V_at)rm -f $(DESTDIR)$(libdir)/libXorg.exe.a +endif + +uninstall-hook: + $(AM_V_at)rm -f $(DESTDIR)$(bindir)/X + # Use variables from XORG_MANPAGE_SECTIONS and X Server configuration # Do not include manpages.am as values are not appropriate for rc files CONF_SUBSTS = -e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g' \