diff options
| author | Ryan Kavanagh <rak@debian.org> | 2013-02-19 15:37:37 -0500 |
|---|---|---|
| committer | Ryan Kavanagh <rak@debian.org> | 2013-02-19 15:37:37 -0500 |
| commit | d3bbe4f074c1489331b68d2f32112a77cdd6228f (patch) | |
| tree | 373fa289674f287001c6f3c176f306c664f04514 | |
| parent | Disable host checking for localhost (diff) | |
Add popup so that auto-complete can build
Diffstat (limited to '')
| -rw-r--r-- | .gitmodules | 3 | ||||
| -rw-r--r-- | emacsen/Makefile | 11 | ||||
| m--------- | emacsen/popup | 0 |
3 files changed, 13 insertions, 1 deletions
diff --git a/.gitmodules b/.gitmodules index 388ede7..5f2626e 100644 --- a/.gitmodules +++ b/.gitmodules @@ -10,3 +10,6 @@ [submodule "emacsen/proofgeneral"] path = emacsen/proofgeneral url = git@github.com:emacsmirror/proofgeneral.git +[submodule "emacsen/popup"] + path = emacsen/popup + url = git@github.com:auto-complete/popup-el.git diff --git a/emacsen/Makefile b/emacsen/Makefile index 134758a..9a3abcf 100644 --- a/emacsen/Makefile +++ b/emacsen/Makefile @@ -6,6 +6,7 @@ export ELISPDIR SUBDIRS = auto-complete \ auto-indent-mode \ magit \ + popup \ proofgeneral # color-theme-6.6.0 \ @@ -34,12 +35,16 @@ $(CLEANDIRS): $(MAKE) -C $(@:clean-%=%) clean # Manual overrides: -make-auto-indent-mode: +make-auto-indent-mode make-popup: touch $@ clean-auto-indent-mode: echo $@ +make-auto-complete: + $(MAKE) -C $(@:make-%=%) -e EMACS="emacs -L ../popup/" + touch $@ + make-proofgeneral: $(MAKE) -C $(@:make-%=%) compile @@ -60,6 +65,10 @@ install-magit: $(MAKE) -C $(@:install-%=%) -e PREFIX="" -e DESTDIR=$(EMACSD) \ -e SYSCONFDIR="" -e ELISP_INSTALL_DIR=$(EMACSD)/$(@:install-%=%) install +install-popup: + mkdir -p $(EMACSD)/$(@:install-%=%) + install -m 644 $(@:install-%=%)/popup.el $(EMACSD)/$(@:install-%=%)/ + install-proofgeneral: -mkdir -p $(EMACSD)/$(@:install-%=%) $(MAKE) -C $(@:install-%=%) -e ELISP=$(EMACSD)/$(@:install-%=%) install-el install-elc diff --git a/emacsen/popup b/emacsen/popup new file mode 160000 +Subproject 748c109f3f7b5a5bd44472b398154341ccac313 |