From 50c085beb5928249f440460ff19c214b669806cd Mon Sep 17 00:00:00 2001 From: Kalle Olavi Niemitalo Date: Sat, 24 Feb 2007 12:15:22 +0200 Subject: [PATCH] Bug 799: Ignore source directory name when uninstalling. This fixes the uninstallation of elinks.conf.5 and elinkskeys.5 when $(srcdir) is not empty, i.e. the build directory is not the same as the source directory. --- Makefile.lib | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Makefile.lib b/Makefile.lib index 94d67f44..3dd69384 100644 --- a/Makefile.lib +++ b/Makefile.lib @@ -66,8 +66,10 @@ quiet_cmd_installdata = " [$(INSTALL_COLOR)INSTALL$(END_COLOR)] $(RELPATH) quiet_cmd_installprog = " [$(INSTALL_COLOR)INSTALL$(END_COLOR)] $(RELPATH)$(2) -> $(3)" cmd_installprog = $(INSTALL_PROGRAM) $(2) $(3) -quiet_cmd_uninstall = " [$(UNINSTALL_COLOR)UNINSTALL$(END_COLOR)] $(3)/$(2)" - cmd_uninstall = $(RM) $(3)/$(2) +# $(INSTALL_DATA) in cmd_installdata doesn't use the directory part of +# $(2) when it forms the output file name, so don't use it here either. +quiet_cmd_uninstall = " [$(UNINSTALL_COLOR)UNINSTALL$(END_COLOR)] $(3)/$(notdir $(2))" + cmd_uninstall = $(RM) $(3)/$(notdir $(2)) ############################################################################# # Special handling of conditional variables