diff options
| author |  Julian Aron Prenner <julian@linux4you.it> | 2014-01-15 15:27:06 +0100 |
|---|---|---|
| committer | Julian Aron Prenner <julian@linux4you.it> | 2014-01-15 15:27:06 +0100 |
| commit | 213e9070446b60c9e6ad7140a6063cd957f241e4 (patch) | |
| tree | 84020202d4daa8df2db3b2533e8963217bb46c49 /Makefile.in | |
| parent | c8d5131a42b8117987d2a278d69edb21a7cf9383 (diff) | |
| parent | 370b47d23f3cfde3e385c2268adb95229f0f7ed7 (diff) | |
Merge remote-tracking branch 'upstream/master' into bind_mode
Conflicts:
builtin.cpp
reader.cpp
share/functions/fish_default_key_bindings.fish
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/Makefile.in b/Makefile.in index b81206d4..31b23d5e 100644 --- a/Makefile.in +++ b/Makefile.in @@ -92,7 +92,7 @@ FISH_OBJS := function.o builtin.o complete.o env.o exec.o expand.o \ env_universal.o env_universal_common.o input_common.o event.o \ signal.o io.o parse_util.o common.o screen.o path.o autoload.o \ parser_keywords.o iothread.o color.o postfork.o \ - builtin_test.o + builtin_test.o parse_tree.o parse_productions.o parse_execution.cpp FISH_INDENT_OBJS := fish_indent.o print_help.o common.o \ parser_keywords.o wutil.o tokenizer.o @@ -552,6 +552,8 @@ install-force: all install-translations $(INSTALL) -m 755 -d $(DESTDIR)$(datadir)/fish/man/man1 $(INSTALL) -m 755 -d $(DESTDIR)$(datadir)/fish/tools $(INSTALL) -m 755 -d $(DESTDIR)$(datadir)/fish/tools/web_config + $(INSTALL) -m 755 -d $(DESTDIR)$(datadir)/fish/tools/web_config/js + $(INSTALL) -m 755 -d $(DESTDIR)$(datadir)/fish/tools/web_config/partials $(INSTALL) -m 755 -d $(DESTDIR)$(datadir)/fish/tools/web_config/sample_prompts $(INSTALL) -m 644 etc/config.fish $(DESTDIR)$(sysconfdir)/fish/ $(INSTALL) -m 644 share/config.fish $(DESTDIR)$(datadir)/fish/ @@ -575,6 +577,14 @@ install-force: all install-translations $(INSTALL) -m 644 $$i $(DESTDIR)$(datadir)/fish/tools/web_config/; \ true; \ done; + for i in share/tools/web_config/js/*; do\ + $(INSTALL) -m 644 $$i $(DESTDIR)$(datadir)/fish/tools/web_config/js/; \ + true; \ + done; + for i in share/tools/web_config/partials/*; do\ + $(INSTALL) -m 644 $$i $(DESTDIR)$(datadir)/fish/tools/web_config/partials/; \ + true; \ + done; for i in share/tools/web_config/sample_prompts/*.fish; do\ $(INSTALL) -m 644 $$i $(DESTDIR)$(datadir)/fish/tools/web_config/sample_prompts/; \ true; \ |