diff --git a/.gitignore b/.gitignore index 91840605..0d2802bd 100644 --- a/.gitignore +++ b/.gitignore @@ -13,6 +13,7 @@ depcomp autom4te.cache stamp-h1 .deps +.vimrc elinks *.swp *.patch diff --git a/Makefile.lib b/Makefile.lib index b6c124af..8e2f90fe 100644 --- a/Makefile.lib +++ b/Makefile.lib @@ -78,9 +78,10 @@ INCLUDE_ALL=1 endif ifneq ($(findstring init,$(MAKECMDGOALS)),) -# FIXME: Detect when $(subdir)/Makefile is $(srcdir)/$(subdir)/Makefile -# and error out so the user won't overwrite the 'master' Makefiles. INCLUDE_ALL=1 +ifndef SRC +SRC = $(shell cd $(top_srcdir) && pwd) +endif endif ifdef INCLUDE_ALL @@ -131,9 +132,13 @@ all-default: $(OBJS) $(PROGS) $(MAN1) $(MAN5) init-recursive: init-default init-default: + @{ echo ':set runtimepath+=.'; \ + echo ':runtime $(SRC)/config/vimrc'; \ + } > .vimrc @$(foreach subdir,$(sort $(SUBDIRS)), \ $(MKINSTALLDIRS) $(subdir) >/dev/null; \ - echo 'include $(SRC)/$(RELPATH)/$(subdir)/Makefile' > $(subdir)/Makefile;) + test -e "$(subdir)/Makefile" \ + || echo 'include $(SRC)/$(RELPATH)/$(subdir)/Makefile' > $(subdir)/Makefile;) clean-default cleanall-default: @-test -z "$(CLEAN)" || $(RM) $(CLEAN) diff --git a/config/.vimrc b/config/.vimrc deleted file mode 100644 index b9796ce1..00000000 --- a/config/.vimrc +++ /dev/null @@ -1,2 +0,0 @@ -:set runtimepath+=. -:runtime ../.vimrc diff --git a/config/m4/.vimrc b/config/m4/.vimrc deleted file mode 100644 index 284fcf0e..00000000 --- a/config/m4/.vimrc +++ /dev/null @@ -1,2 +0,0 @@ -:set runtimepath+=. -:runtime ../../.vimrc diff --git a/.vimrc b/config/vimrc similarity index 70% rename from .vimrc rename to config/vimrc index 5b83db24..59c5edc2 100644 --- a/.vimrc +++ b/config/vimrc @@ -1,3 +1,5 @@ +" Master vimrc file for the ELinks project + :set shiftwidth=8 :set tabstop=8 :set softtabstop=0 diff --git a/configure.in b/configure.in index ea911848..616b305a 100644 --- a/configure.in +++ b/configure.in @@ -1348,9 +1348,9 @@ abs_srcdir="$(cd "$srcdir" && pwd)" # builddir is always absolute! if test "$abs_srcdir" != "$builddir"; then echo "include $abs_srcdir/Makefile" > "$builddir/Makefile" - "$MAKE" "SRC=$abs_srcdir" init fi +"$MAKE" "SRC=$abs_srcdir" init dnl =================================================================== dnl Configuration summary diff --git a/debian/.vimrc b/debian/.vimrc deleted file mode 100644 index b9796ce1..00000000 --- a/debian/.vimrc +++ /dev/null @@ -1,2 +0,0 @@ -:set runtimepath+=. -:runtime ../.vimrc diff --git a/doc/.vimrc b/doc/.vimrc deleted file mode 100644 index b9796ce1..00000000 --- a/doc/.vimrc +++ /dev/null @@ -1,2 +0,0 @@ -:set runtimepath+=. -:runtime ../.vimrc diff --git a/doc/man/.vimrc b/doc/man/.vimrc deleted file mode 100644 index 284fcf0e..00000000 --- a/doc/man/.vimrc +++ /dev/null @@ -1,2 +0,0 @@ -:set runtimepath+=. -:runtime ../../.vimrc diff --git a/doc/man/man1/.vimrc b/doc/man/man1/.vimrc deleted file mode 100644 index 18f65e47..00000000 --- a/doc/man/man1/.vimrc +++ /dev/null @@ -1,2 +0,0 @@ -:set runtimepath+=. -:runtime ../../../.vimrc diff --git a/doc/man/man5/.vimrc b/doc/man/man5/.vimrc deleted file mode 100644 index 18f65e47..00000000 --- a/doc/man/man5/.vimrc +++ /dev/null @@ -1,2 +0,0 @@ -:set runtimepath+=. -:runtime ../../../.vimrc diff --git a/doc/tools/.vimrc b/doc/tools/.vimrc deleted file mode 100644 index 284fcf0e..00000000 --- a/doc/tools/.vimrc +++ /dev/null @@ -1,2 +0,0 @@ -:set runtimepath+=. -:runtime ../../.vimrc diff --git a/po/.vimrc b/po/.vimrc deleted file mode 100644 index b9796ce1..00000000 --- a/po/.vimrc +++ /dev/null @@ -1,2 +0,0 @@ -:set runtimepath+=. -:runtime ../.vimrc diff --git a/src/.vimrc b/src/.vimrc deleted file mode 100644 index b9796ce1..00000000 --- a/src/.vimrc +++ /dev/null @@ -1,2 +0,0 @@ -:set runtimepath+=. -:runtime ../.vimrc diff --git a/src/bfu/.vimrc b/src/bfu/.vimrc deleted file mode 100644 index 284fcf0e..00000000 --- a/src/bfu/.vimrc +++ /dev/null @@ -1,2 +0,0 @@ -:set runtimepath+=. -:runtime ../../.vimrc diff --git a/src/bookmarks/.vimrc b/src/bookmarks/.vimrc deleted file mode 100644 index 284fcf0e..00000000 --- a/src/bookmarks/.vimrc +++ /dev/null @@ -1,2 +0,0 @@ -:set runtimepath+=. -:runtime ../../.vimrc diff --git a/src/bookmarks/backend/.vimrc b/src/bookmarks/backend/.vimrc deleted file mode 100644 index 18f65e47..00000000 --- a/src/bookmarks/backend/.vimrc +++ /dev/null @@ -1,2 +0,0 @@ -:set runtimepath+=. -:runtime ../../../.vimrc diff --git a/src/cache/.vimrc b/src/cache/.vimrc deleted file mode 100644 index 284fcf0e..00000000 --- a/src/cache/.vimrc +++ /dev/null @@ -1,2 +0,0 @@ -:set runtimepath+=. -:runtime ../../.vimrc diff --git a/src/config/.vimrc b/src/config/.vimrc deleted file mode 100644 index 284fcf0e..00000000 --- a/src/config/.vimrc +++ /dev/null @@ -1,2 +0,0 @@ -:set runtimepath+=. -:runtime ../../.vimrc diff --git a/src/cookies/.vimrc b/src/cookies/.vimrc deleted file mode 100644 index 284fcf0e..00000000 --- a/src/cookies/.vimrc +++ /dev/null @@ -1,2 +0,0 @@ -:set runtimepath+=. -:runtime ../../.vimrc diff --git a/src/dialogs/.vimrc b/src/dialogs/.vimrc deleted file mode 100644 index 284fcf0e..00000000 --- a/src/dialogs/.vimrc +++ /dev/null @@ -1,2 +0,0 @@ -:set runtimepath+=. -:runtime ../../.vimrc diff --git a/src/document/.vimrc b/src/document/.vimrc deleted file mode 100644 index 284fcf0e..00000000 --- a/src/document/.vimrc +++ /dev/null @@ -1,2 +0,0 @@ -:set runtimepath+=. -:runtime ../../.vimrc diff --git a/src/document/css/.vimrc b/src/document/css/.vimrc deleted file mode 100644 index 18f65e47..00000000 --- a/src/document/css/.vimrc +++ /dev/null @@ -1,2 +0,0 @@ -:set runtimepath+=. -:runtime ../../../.vimrc diff --git a/src/document/dom/.vimrc b/src/document/dom/.vimrc deleted file mode 100644 index 18f65e47..00000000 --- a/src/document/dom/.vimrc +++ /dev/null @@ -1,2 +0,0 @@ -:set runtimepath+=. -:runtime ../../../.vimrc diff --git a/src/document/html/.vimrc b/src/document/html/.vimrc deleted file mode 100644 index 18f65e47..00000000 --- a/src/document/html/.vimrc +++ /dev/null @@ -1,2 +0,0 @@ -:set runtimepath+=. -:runtime ../../../.vimrc diff --git a/src/document/html/parser/.vimrc b/src/document/html/parser/.vimrc deleted file mode 100644 index be903491..00000000 --- a/src/document/html/parser/.vimrc +++ /dev/null @@ -1,2 +0,0 @@ -:set runtimepath+=. -:runtime ../../../../.vimrc diff --git a/src/document/plain/.vimrc b/src/document/plain/.vimrc deleted file mode 100644 index 18f65e47..00000000 --- a/src/document/plain/.vimrc +++ /dev/null @@ -1,2 +0,0 @@ -:set runtimepath+=. -:runtime ../../../.vimrc diff --git a/src/dom/.vimrc b/src/dom/.vimrc deleted file mode 100644 index 284fcf0e..00000000 --- a/src/dom/.vimrc +++ /dev/null @@ -1,2 +0,0 @@ -:set runtimepath+=. -:runtime ../../.vimrc diff --git a/src/dom/css/.vimrc b/src/dom/css/.vimrc deleted file mode 100644 index 18f65e47..00000000 --- a/src/dom/css/.vimrc +++ /dev/null @@ -1,2 +0,0 @@ -:set runtimepath+=. -:runtime ../../../.vimrc diff --git a/src/dom/sgml/.vimrc b/src/dom/sgml/.vimrc deleted file mode 100644 index 18f65e47..00000000 --- a/src/dom/sgml/.vimrc +++ /dev/null @@ -1,2 +0,0 @@ -:set runtimepath+=. -:runtime ../../../.vimrc diff --git a/src/dom/sgml/docbook/.vimrc b/src/dom/sgml/docbook/.vimrc deleted file mode 100644 index 18f65e47..00000000 --- a/src/dom/sgml/docbook/.vimrc +++ /dev/null @@ -1,2 +0,0 @@ -:set runtimepath+=. -:runtime ../../../.vimrc diff --git a/src/dom/test/.vimrc b/src/dom/test/.vimrc deleted file mode 100644 index 18f65e47..00000000 --- a/src/dom/test/.vimrc +++ /dev/null @@ -1,2 +0,0 @@ -:set runtimepath+=. -:runtime ../../../.vimrc diff --git a/src/ecmascript/.vimrc b/src/ecmascript/.vimrc deleted file mode 100644 index 284fcf0e..00000000 --- a/src/ecmascript/.vimrc +++ /dev/null @@ -1,2 +0,0 @@ -:set runtimepath+=. -:runtime ../../.vimrc diff --git a/src/ecmascript/spidermonkey/.vimrc b/src/ecmascript/spidermonkey/.vimrc deleted file mode 100644 index 18f65e47..00000000 --- a/src/ecmascript/spidermonkey/.vimrc +++ /dev/null @@ -1,2 +0,0 @@ -:set runtimepath+=. -:runtime ../../../.vimrc diff --git a/src/encoding/.vimrc b/src/encoding/.vimrc deleted file mode 100644 index 284fcf0e..00000000 --- a/src/encoding/.vimrc +++ /dev/null @@ -1,2 +0,0 @@ -:set runtimepath+=. -:runtime ../../.vimrc diff --git a/src/formhist/.vimrc b/src/formhist/.vimrc deleted file mode 100644 index 284fcf0e..00000000 --- a/src/formhist/.vimrc +++ /dev/null @@ -1,2 +0,0 @@ -:set runtimepath+=. -:runtime ../../.vimrc diff --git a/src/globhist/.vimrc b/src/globhist/.vimrc deleted file mode 100644 index 284fcf0e..00000000 --- a/src/globhist/.vimrc +++ /dev/null @@ -1,2 +0,0 @@ -:set runtimepath+=. -:runtime ../../.vimrc diff --git a/src/intl/.vimrc b/src/intl/.vimrc deleted file mode 100644 index 284fcf0e..00000000 --- a/src/intl/.vimrc +++ /dev/null @@ -1,2 +0,0 @@ -:set runtimepath+=. -:runtime ../../.vimrc diff --git a/src/intl/gettext/.vimrc b/src/intl/gettext/.vimrc deleted file mode 100644 index 18f65e47..00000000 --- a/src/intl/gettext/.vimrc +++ /dev/null @@ -1,2 +0,0 @@ -:set runtimepath+=. -:runtime ../../../.vimrc diff --git a/src/main/.vimrc b/src/main/.vimrc deleted file mode 100644 index 284fcf0e..00000000 --- a/src/main/.vimrc +++ /dev/null @@ -1,2 +0,0 @@ -:set runtimepath+=. -:runtime ../../.vimrc diff --git a/src/mime/.vimrc b/src/mime/.vimrc deleted file mode 100644 index 284fcf0e..00000000 --- a/src/mime/.vimrc +++ /dev/null @@ -1,2 +0,0 @@ -:set runtimepath+=. -:runtime ../../.vimrc diff --git a/src/mime/backend/.vimrc b/src/mime/backend/.vimrc deleted file mode 100644 index 18f65e47..00000000 --- a/src/mime/backend/.vimrc +++ /dev/null @@ -1,2 +0,0 @@ -:set runtimepath+=. -:runtime ../../../.vimrc diff --git a/src/network/.vimrc b/src/network/.vimrc deleted file mode 100644 index 284fcf0e..00000000 --- a/src/network/.vimrc +++ /dev/null @@ -1,2 +0,0 @@ -:set runtimepath+=. -:runtime ../../.vimrc diff --git a/src/network/ssl/.vimrc b/src/network/ssl/.vimrc deleted file mode 100644 index 18f65e47..00000000 --- a/src/network/ssl/.vimrc +++ /dev/null @@ -1,2 +0,0 @@ -:set runtimepath+=. -:runtime ../../../.vimrc diff --git a/src/osdep/.vimrc b/src/osdep/.vimrc deleted file mode 100644 index 284fcf0e..00000000 --- a/src/osdep/.vimrc +++ /dev/null @@ -1,2 +0,0 @@ -:set runtimepath+=. -:runtime ../../.vimrc diff --git a/src/osdep/beos/.vimrc b/src/osdep/beos/.vimrc deleted file mode 100644 index 18f65e47..00000000 --- a/src/osdep/beos/.vimrc +++ /dev/null @@ -1,2 +0,0 @@ -:set runtimepath+=. -:runtime ../../../.vimrc diff --git a/src/osdep/os2/.vimrc b/src/osdep/os2/.vimrc deleted file mode 100644 index 18f65e47..00000000 --- a/src/osdep/os2/.vimrc +++ /dev/null @@ -1,2 +0,0 @@ -:set runtimepath+=. -:runtime ../../../.vimrc diff --git a/src/osdep/riscos/.vimrc b/src/osdep/riscos/.vimrc deleted file mode 100644 index 18f65e47..00000000 --- a/src/osdep/riscos/.vimrc +++ /dev/null @@ -1,2 +0,0 @@ -:set runtimepath+=. -:runtime ../../../.vimrc diff --git a/src/osdep/unix/.vimrc b/src/osdep/unix/.vimrc deleted file mode 100644 index 18f65e47..00000000 --- a/src/osdep/unix/.vimrc +++ /dev/null @@ -1,2 +0,0 @@ -:set runtimepath+=. -:runtime ../../../.vimrc diff --git a/src/osdep/win32/.vimrc b/src/osdep/win32/.vimrc deleted file mode 100644 index 18f65e47..00000000 --- a/src/osdep/win32/.vimrc +++ /dev/null @@ -1,2 +0,0 @@ -:set runtimepath+=. -:runtime ../../../.vimrc diff --git a/src/protocol/.vimrc b/src/protocol/.vimrc deleted file mode 100644 index 284fcf0e..00000000 --- a/src/protocol/.vimrc +++ /dev/null @@ -1,2 +0,0 @@ -:set runtimepath+=. -:runtime ../../.vimrc diff --git a/src/protocol/auth/.vimrc b/src/protocol/auth/.vimrc deleted file mode 100644 index 18f65e47..00000000 --- a/src/protocol/auth/.vimrc +++ /dev/null @@ -1,2 +0,0 @@ -:set runtimepath+=. -:runtime ../../../.vimrc diff --git a/src/protocol/bittorrent/.vimrc b/src/protocol/bittorrent/.vimrc deleted file mode 100644 index 18f65e47..00000000 --- a/src/protocol/bittorrent/.vimrc +++ /dev/null @@ -1,2 +0,0 @@ -:set runtimepath+=. -:runtime ../../../.vimrc diff --git a/src/protocol/file/.vimrc b/src/protocol/file/.vimrc deleted file mode 100644 index 18f65e47..00000000 --- a/src/protocol/file/.vimrc +++ /dev/null @@ -1,2 +0,0 @@ -:set runtimepath+=. -:runtime ../../../.vimrc diff --git a/src/protocol/finger/.vimrc b/src/protocol/finger/.vimrc deleted file mode 100644 index 18f65e47..00000000 --- a/src/protocol/finger/.vimrc +++ /dev/null @@ -1,2 +0,0 @@ -:set runtimepath+=. -:runtime ../../../.vimrc diff --git a/src/protocol/ftp/.vimrc b/src/protocol/ftp/.vimrc deleted file mode 100644 index 18f65e47..00000000 --- a/src/protocol/ftp/.vimrc +++ /dev/null @@ -1,2 +0,0 @@ -:set runtimepath+=. -:runtime ../../../.vimrc diff --git a/src/protocol/gopher/.vimrc b/src/protocol/gopher/.vimrc deleted file mode 100644 index 18f65e47..00000000 --- a/src/protocol/gopher/.vimrc +++ /dev/null @@ -1,2 +0,0 @@ -:set runtimepath+=. -:runtime ../../../.vimrc diff --git a/src/protocol/http/.vimrc b/src/protocol/http/.vimrc deleted file mode 100644 index 18f65e47..00000000 --- a/src/protocol/http/.vimrc +++ /dev/null @@ -1,2 +0,0 @@ -:set runtimepath+=. -:runtime ../../../.vimrc diff --git a/src/protocol/nntp/.vimrc b/src/protocol/nntp/.vimrc deleted file mode 100644 index 18f65e47..00000000 --- a/src/protocol/nntp/.vimrc +++ /dev/null @@ -1,2 +0,0 @@ -:set runtimepath+=. -:runtime ../../../.vimrc diff --git a/src/protocol/rewrite/.vimrc b/src/protocol/rewrite/.vimrc deleted file mode 100644 index 18f65e47..00000000 --- a/src/protocol/rewrite/.vimrc +++ /dev/null @@ -1,2 +0,0 @@ -:set runtimepath+=. -:runtime ../../../.vimrc diff --git a/src/protocol/smb/.vimrc b/src/protocol/smb/.vimrc deleted file mode 100644 index 18f65e47..00000000 --- a/src/protocol/smb/.vimrc +++ /dev/null @@ -1,2 +0,0 @@ -:set runtimepath+=. -:runtime ../../../.vimrc diff --git a/src/scripting/.vimrc b/src/scripting/.vimrc deleted file mode 100644 index 284fcf0e..00000000 --- a/src/scripting/.vimrc +++ /dev/null @@ -1,2 +0,0 @@ -:set runtimepath+=. -:runtime ../../.vimrc diff --git a/src/scripting/guile/.vimrc b/src/scripting/guile/.vimrc deleted file mode 100644 index 18f65e47..00000000 --- a/src/scripting/guile/.vimrc +++ /dev/null @@ -1,2 +0,0 @@ -:set runtimepath+=. -:runtime ../../../.vimrc diff --git a/src/scripting/lua/.vimrc b/src/scripting/lua/.vimrc deleted file mode 100644 index 18f65e47..00000000 --- a/src/scripting/lua/.vimrc +++ /dev/null @@ -1,2 +0,0 @@ -:set runtimepath+=. -:runtime ../../../.vimrc diff --git a/src/scripting/perl/.vimrc b/src/scripting/perl/.vimrc deleted file mode 100644 index 18f65e47..00000000 --- a/src/scripting/perl/.vimrc +++ /dev/null @@ -1,2 +0,0 @@ -:set runtimepath+=. -:runtime ../../../.vimrc diff --git a/src/scripting/python/.vimrc b/src/scripting/python/.vimrc deleted file mode 100644 index 18f65e47..00000000 --- a/src/scripting/python/.vimrc +++ /dev/null @@ -1,2 +0,0 @@ -:set runtimepath+=. -:runtime ../../../.vimrc diff --git a/src/scripting/ruby/.vimrc b/src/scripting/ruby/.vimrc deleted file mode 100644 index 18f65e47..00000000 --- a/src/scripting/ruby/.vimrc +++ /dev/null @@ -1,2 +0,0 @@ -:set runtimepath+=. -:runtime ../../../.vimrc diff --git a/src/session/.vimrc b/src/session/.vimrc deleted file mode 100644 index 284fcf0e..00000000 --- a/src/session/.vimrc +++ /dev/null @@ -1,2 +0,0 @@ -:set runtimepath+=. -:runtime ../../.vimrc diff --git a/src/terminal/.vimrc b/src/terminal/.vimrc deleted file mode 100644 index 284fcf0e..00000000 --- a/src/terminal/.vimrc +++ /dev/null @@ -1,2 +0,0 @@ -:set runtimepath+=. -:runtime ../../.vimrc diff --git a/src/util/.vimrc b/src/util/.vimrc deleted file mode 100644 index 284fcf0e..00000000 --- a/src/util/.vimrc +++ /dev/null @@ -1,2 +0,0 @@ -:set runtimepath+=. -:runtime ../../.vimrc diff --git a/src/viewer/.vimrc b/src/viewer/.vimrc deleted file mode 100644 index 284fcf0e..00000000 --- a/src/viewer/.vimrc +++ /dev/null @@ -1,2 +0,0 @@ -:set runtimepath+=. -:runtime ../../.vimrc diff --git a/src/viewer/dump/.vimrc b/src/viewer/dump/.vimrc deleted file mode 100644 index 18f65e47..00000000 --- a/src/viewer/dump/.vimrc +++ /dev/null @@ -1,2 +0,0 @@ -:set runtimepath+=. -:runtime ../../../.vimrc diff --git a/src/viewer/text/.vimrc b/src/viewer/text/.vimrc deleted file mode 100644 index 18f65e47..00000000 --- a/src/viewer/text/.vimrc +++ /dev/null @@ -1,2 +0,0 @@ -:set runtimepath+=. -:runtime ../../../.vimrc