From 9c20c7e8c6898c98359e58087a4e5c4b8005649b Mon Sep 17 00:00:00 2001
From: Ryan Kavanagh <rak@debian.org>
Date: Wed, 16 Sep 2015 11:47:15 -0400
Subject: More work on emacs config... working now

---
 emacsen/Makefile    | 11 +++++------
 emacsen/popup       |  1 -
 emacsen/use-package |  1 -
 3 files changed, 5 insertions(+), 8 deletions(-)
 delete mode 160000 emacsen/popup
 delete mode 160000 emacsen/use-package

(limited to 'emacsen')

diff --git a/emacsen/Makefile b/emacsen/Makefile
index 402f081..7ebb4c1 100644
--- a/emacsen/Makefile
+++ b/emacsen/Makefile
@@ -4,8 +4,7 @@ EMACSD=$(ROOT)/build/.emacs.d/
 export ELISPDIR
 EMACSEN=$(ROOT)/emacsen
 
-SUBDIRS = dictem \
-	  use-package
+SUBDIRS = dictem
 
 MAKEDIRS = $(SUBDIRS:%=make-%)
 INSTALLDIRS = $(SUBDIRS:%=install-%)
@@ -20,7 +19,7 @@ $(MAKEDIRS):
 	touch $@
 
 install: $(INSTALLDIRS)
-	install-info $(EMACSD)/share/info/*.info $(EMACSD)/share/info/dir
+	[ ! -d $(EMACSD)/share/info ] || install-info $(EMACSD)/share/info/*.info $(EMACSD)/share/info/dir
 
 install-% : make-%
 $(INSTALLDIRS):
@@ -34,13 +33,13 @@ $(CLEANDIRS):
 	[ ! -f $(@:clean-%=%)/Makefile ] || $(MAKE) -C $(@:clean-%=%) clean
 
 # Manual overrides:
-make-dictem install-use-package:
+make-dictem:
 	touch $@
 
-clean-dictem install-use-package:
+clean-dictem:
 	echo $@
 
-install-dictem install-use-package:
+install-dictem:
 	-mkdir -p $(EMACSD)/$(@:install-%=%)
 	install -m 644 $(@:install-%=%)/*.el $(EMACSD)/$(@:install-%=%)
 
diff --git a/emacsen/popup b/emacsen/popup
deleted file mode 160000
index 748c109..0000000
--- a/emacsen/popup
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 748c109f3f7b5a5bd44472b398154341ccac3132
diff --git a/emacsen/use-package b/emacsen/use-package
deleted file mode 160000
index 4b7917c..0000000
--- a/emacsen/use-package
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 4b7917cc276b33cd7daff96ef764f4626baf0a5c
-- 
cgit v1.2.3