From 40956ae026974be3fb746eb48f141b8eb14470da Mon Sep 17 00:00:00 2001
From: Jesse Luehrs <doy@tozt.net>
Date: Mon, 29 Oct 2018 02:32:35 -0400
Subject: fix make clean

---
 Makefile        | 21 +++++++++++++++++----
 Makefile.laptop |  2 +-
 Makefile.osx    |  2 +-
 Makefile.server |  2 +-
 4 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/Makefile b/Makefile
index 88028dc..036b0dd 100644
--- a/Makefile
+++ b/Makefile
@@ -57,9 +57,8 @@ EMPTYDIRS := \
     .cache/vim/hist \
     .cache/vim/undo \
 
-INSTALLED := \
-    $(INSTALLED) \
-    $(patsubst %,$(INTO)/%,$(EMPTYDIRS) $(INSTALL))
+INSTALL_CUSTOM := \
+    $(INSTALL_CUSTOM)
 
 BUILD := \
     $(BUILD) \
@@ -68,10 +67,22 @@ BUILD := \
     vim/spell/en.utf-8.add.spl \
     less
 
+INSTALLED_SYMLINKS := \
+    $(patsubst %,$(INTO)/%,$(INSTALL)) \
+    $(INSTALL_CUSTOM)
+
+INSTALLED_DIRS := \
+    $(patsubst %,$(INTO)/%,$(EMPTYDIRS))
+
+INSTALLED := \
+    $(INSTALLED_SYMLINKS) \
+    $(INSTALLED_DIRS)
+
 ECHO      = @echo
 LN        = @ln -sf
 MKDIR     = @mkdir -p
 RM        = @rm -f
+RMDIR     = @rmdir -p
 
 # named targets
 
@@ -87,7 +98,9 @@ install :: all $(INSTALLED)
 
 clean ::
 	$(ECHO) Cleaning from $(INTO)
-	$(RM) $(BUILD) $(INSTALLED)
+	$(RM) $(BUILD)
+	$(RM) $(INSTALLED_SYMLINKS)
+	$(RMDIR) $(INSTALLED_DIRS)
 
 update :
 	@git submodule foreach '(if [ $$path == "vim/pack/filetype/start/perl" ]; then git checkout dev; else git checkout master; fi) && git pull'
diff --git a/Makefile.laptop b/Makefile.laptop
index f354ab7..175face 100644
--- a/Makefile.laptop
+++ b/Makefile.laptop
@@ -22,7 +22,7 @@ EMPTYDIRS := \
     .cache/mpd \
     .config/mpd/playlists
 
-INSTALLED := \
+INSTALL_CUSTOM := \
     $(patsubst services/available/%,$(INTO)/.services/enabled/%,$(wildcard services/available/*)) \
     /var/spool/cron/$(USER) \
     $(INTO)/Maildir/.notmuch/hooks/post-new
diff --git a/Makefile.osx b/Makefile.osx
index 5e29806..5ea67d9 100644
--- a/Makefile.osx
+++ b/Makefile.osx
@@ -5,6 +5,6 @@ INSTALL := \
 
 EMPTYDIRS := \
 
-INSTALLED := \
+INSTALL_CUSTOM := \
 
 BUILD := \
diff --git a/Makefile.server b/Makefile.server
index 9c48f35..a707ce0 100644
--- a/Makefile.server
+++ b/Makefile.server
@@ -4,6 +4,6 @@ INSTALL := \
 
 EMPTYDIRS := \
 
-INSTALLED := \
+INSTALL_CUSTOM := \
 
 BUILD := \
-- 
cgit v1.2.3-54-g00ecf