From 5664421b0db4c5525b0437ab01b78e66f1d72f0f Mon Sep 17 00:00:00 2001 From: P. J. McDermott Date: Wed, 25 Jan 2012 03:56:13 -0500 Subject: Fix uninstallation. * Read installation configuration file. * Correctly spell macro names. --- diff --git a/Makefile.in b/Makefile.in index 77a7368..99c55c1 100644 --- a/Makefile.in +++ b/Makefile.in @@ -73,8 +73,8 @@ install: all .PHONY: uninstall uninstall: @printf 'Uninstalling executable files...\n' - @cd src && $(MAKE) uninstall + @cd src && $(MAKE) $$(cat ../install.config) uninstall @printf 'Uninstalling library files...\n' - @cd lib && $(MAKE) uninstall + @cd lib && $(MAKE) $$(cat ../install.config) uninstall @printf 'Uninstalling manual pages...\n' - @cd man && $(MAKE) uninstall + @cd man && $(MAKE) $$(cat ../install.config) uninstall diff --git a/lib/Makefile.in b/lib/Makefile.in index cc2f4cb..5d613e7 100644 --- a/lib/Makefile.in +++ b/lib/Makefile.in @@ -52,7 +52,7 @@ install: all .PHONY: uninstall uninstall: - @for obj in $(OBJ); do \ + @for obj in $(OBJS); do \ printf ' RM %s\n' "$${obj}"; \ rm -f "$(DESTDIR)/$(LIBDIR)/$${obj}"; \ done diff --git a/man/Makefile.in b/man/Makefile.in index 4da185d..832ff0f 100644 --- a/man/Makefile.in +++ b/man/Makefile.in @@ -53,7 +53,7 @@ install: all .PHONY: uninstall uninstall: - @for obj in $(OBJ); do \ + @for obj in $(OBJS); do \ printf ' RM %s\n' "$${obj}"; \ section=$$(echo "$${obj}" | sed 's/^.*[.]\([0-9]\)$$/\1/'); \ rm -f "$(DESTDIR)/$(MANDIR)/man$${section}/$${obj}"; \ diff --git a/src/Makefile.in b/src/Makefile.in index 318b7c5..e3895d4 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -52,7 +52,7 @@ install: all .PHONY: uninstall uninstall: - @for obj in $(OBJ); do \ + @for obj in $(OBJS); do \ printf ' RM %s\n' "$${obj}"; \ rm -f "$(DESTDIR)/$(BINDIR)/$${obj}"; \ done -- cgit v0.9.1