From d8aa1d0ed1cc726ea3d7cd6a39e0f57379d2142d Mon Sep 17 00:00:00 2001
From: Tom Willemse
Date: Sun, 14 Apr 2013 01:03:11 +0200
Subject: Have the install command uninstall first

The new uninstall functionality tries to remove any "orphan" files.
Files that were installed during the last install, but will not be
installed this time (because of removal, not necessity).
---
 emacs/Makefile                      | 2 +-
 emacs/eshell/Makefile               | 2 +-
 emacs/site-lisp/Makefile            | 2 +-
 emacs/snippets/Makefile             | 2 +-
 emacs/snippets/html-mode/Makefile   | 2 +-
 emacs/snippets/org-mode/Makefile    | 2 +-
 emacs/snippets/python-mode/Makefile | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'emacs')

diff --git a/emacs/Makefile b/emacs/Makefile
index 43ee5ec..5f8d204 100644
--- a/emacs/Makefile
+++ b/emacs/Makefile
@@ -1,4 +1,4 @@
-DESTDIR:=$(DESTDIR)/.emacs.d
+SUBDIR=.emacs.d
 objects=init.elc init.el gnus.elc gnus.el
 modules=eshell site-lisp snippets
 
diff --git a/emacs/eshell/Makefile b/emacs/eshell/Makefile
index fd3b0f2..3b6ce2f 100644
--- a/emacs/eshell/Makefile
+++ b/emacs/eshell/Makefile
@@ -1,4 +1,4 @@
-DESTDIR:=$(DESTDIR)/eshell
+SUBDIR=eshell
 objects=alias
 modules=
 
diff --git a/emacs/site-lisp/Makefile b/emacs/site-lisp/Makefile
index bf452e9..91ee32e 100644
--- a/emacs/site-lisp/Makefile
+++ b/emacs/site-lisp/Makefile
@@ -1,4 +1,4 @@
-DESTDIR:=$(DESTDIR)/site-lisp
+SUBDIR=site-lisp
 objects=dzen.elc dzen.el eltuki.elc eltuki.el ext.elc ext.el \
 	metalexpress.elc metalexpress.el mu4e-init.elc mu4e-init.el \
 	oni.elc oni.el org-init.elc org-init.el quick-edit-mode.elc \
diff --git a/emacs/snippets/Makefile b/emacs/snippets/Makefile
index 12ff544..e003ed3 100644
--- a/emacs/snippets/Makefile
+++ b/emacs/snippets/Makefile
@@ -1,4 +1,4 @@
-DESTDIR:=$(DESTDIR)/snippets
+SUBDIR=snippets
 modules=html-mode org-mode python-mode
 
 include ../../dotfiles.mk
diff --git a/emacs/snippets/html-mode/Makefile b/emacs/snippets/html-mode/Makefile
index b2dff78..2d6defe 100644
--- a/emacs/snippets/html-mode/Makefile
+++ b/emacs/snippets/html-mode/Makefile
@@ -1,4 +1,4 @@
-DESTDIR:=$(DESTDIR)/html-mode
+SUBDIR=html-mode
 objects=for generic-block
 
 include ../../../dotfiles.mk
diff --git a/emacs/snippets/org-mode/Makefile b/emacs/snippets/org-mode/Makefile
index 34d4cd9..670b139 100644
--- a/emacs/snippets/org-mode/Makefile
+++ b/emacs/snippets/org-mode/Makefile
@@ -1,4 +1,4 @@
-DESTDIR:=$(DESTDIR)/org-mode
+SUBDIR=org-mode
 objects=codeblock heading project snippet
 
 include ../../../dotfiles.mk
diff --git a/emacs/snippets/python-mode/Makefile b/emacs/snippets/python-mode/Makefile
index 192657b..8e8b652 100644
--- a/emacs/snippets/python-mode/Makefile
+++ b/emacs/snippets/python-mode/Makefile
@@ -1,4 +1,4 @@
-DESTDIR:=$(DESTDIR)/python-mode
+SUBDIR=python-mode
 objects=defm_empty form form_valid import_from permission_guard url
 
 include ../../../dotfiles.mk
-- 
cgit v1.2.3-54-g00ecf