diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-02-01T15·41+0100 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-02-01T15·41+0100 |
| commit | 2f9bb5c7e744ddca3fbe5576e520a3e80c106c55 (patch) | |
| tree | 7a3d5d57a460aa87a8f8b58d46102ca339e97770 /misc | |
| parent | c5ba08133370f98de722c978bda3b446721985de (diff) | |
| parent | 6dca72006aa9b1cf2f226bb5b538e744fcab976f (diff) | |
Merge branch 'make'
Diffstat (limited to 'misc')
| -rw-r--r-- | misc/Makefile.am | 1 | ||||
| -rw-r--r-- | misc/emacs/Makefile.am | 5 | ||||
| -rw-r--r-- | misc/emacs/local.mk | 1 |
3 files changed, 1 insertions, 6 deletions
diff --git a/misc/Makefile.am b/misc/Makefile.am deleted file mode 100644 index ef10d1e98120..000000000000 --- a/misc/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -SUBDIRS = emacs diff --git a/misc/emacs/Makefile.am b/misc/emacs/Makefile.am deleted file mode 100644 index 49f19fe50628..000000000000 --- a/misc/emacs/Makefile.am +++ /dev/null @@ -1,5 +0,0 @@ -EXTRA_DIST = nix-mode.el - -install-data-local: - $(INSTALL) -d $(DESTDIR)$(datadir)/emacs/site-lisp - $(INSTALL_DATA) $(srcdir)/nix-mode.el $(DESTDIR)$(datadir)/emacs/site-lisp diff --git a/misc/emacs/local.mk b/misc/emacs/local.mk new file mode 100644 index 000000000000..8e06b881bcdf --- /dev/null +++ b/misc/emacs/local.mk @@ -0,0 +1 @@ +$(eval $(call install-data-in,$(d)/nix-mode.el,$(datadir)/emacs/site-lisp)) |