Skip to content

Commit

Permalink
Remove mention of fish_inputrc in install scripts. The file no longer…
Browse files Browse the repository at this point in the history
… exists.

darcs-hash:20071014115259-75c98-f43cd2358ddd15b28eba4d47de383bef8c794615.gz
  • Loading branch information
liljencrantz committed Oct 14, 2007
1 parent 25305c6 commit 8904ab4
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 4 deletions.
5 changes: 2 additions & 3 deletions Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@ MAIN_DIR_FILES := $(sort $(MAIN_DIR_FILES_UNSORTED))
# Files in ./etc/
#

ETC_DIR_FILES :=etc/config.fish.in etc/fish_inputrc
ETC_DIR_FILES :=etc/config.fish.in


#
Expand Down Expand Up @@ -585,7 +585,6 @@ install-force: all install-translations
for i in share/man/*.1; do \
$(INSTALL) -m 644 $$i $(DESTDIR)$(datadir)/fish/man/; \
done;
$(INSTALL) -m 644 etc/fish_inputrc $(DESTDIR)$(sysconfdir)/fish/fish_inputrc;
$(INSTALL) -m 755 -d $(DESTDIR)$(docdir)
for i in user_doc/html/* ChangeLog; do \
if test -f $$i; then \
Expand Down Expand Up @@ -617,7 +616,6 @@ uninstall: uninstall-translations
done;
-rm -f $(DESTDIR)$(bindir)/xsel
-rm -f $(DESTDIR)$(sysconfdir)/fish/config.fish
-rm -f $(DESTDIR)$(sysconfdir)/fish/fish_inputrc
-rmdir $(DESTDIR)$(sysconfdir)/fish
-if test -d $(DESTDIR)$(datadir)/fish; then \
rm -r $(DESTDIR)$(datadir)/fish; \
Expand All @@ -642,6 +640,7 @@ uninstall-legacy: uninstall
-rm -f $(DESTDIR)$(sysconfdir)/fish.d/fish_interactive.fish
-rm -f $(DESTDIR)$(sysconfdir)/fish.d/fish_complete.fish
-rm -f $(DESTDIR)$(sysconfdir)/fish.d/fish_function.fish
-rm -f $(DESTDIR)$(sysconfdir)/fish/fish_inputrc
-if test -d $(DESTDIR)$(sysconfdir)/fish.d/completions; then \
for i in $(COMPLETIONS_DIR_FILES); do \
basename=`basename $$i`; \
Expand Down
1 change: 0 additions & 1 deletion fish.spec.in
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,6 @@ fi

# Configuration files
%config %_sysconfdir/fish/config.fish
%config %_sysconfdir/fish/fish_inputrc
%dir %_sysconfdir/fish

# Non-configuration initialization files
Expand Down

0 comments on commit 8904ab4

Please sign in to comment.