Autogenerate .vimrc files and put the master in config/vimrc

This changes the init target to be idempotent: most importantly it will now never overwrite a Makefile if it exists. Additionally 'make init' will generate the .vimrc files. Yay, no more stupid 'added fairies' commits! ;)
2024-06-20 00:15:31 +00:00 · 2006-01-15 18:37:34 +01:00 · 2006-01-15 18:37:34 +01:00 · 2748d043f9
commit 2748d043f9
parent 2a4afa22b1
73 changed files with 12 additions and 142 deletions
--- a/.gitignore
+++ b/.gitignore
@ -13,6 +13,7 @@ depcomp
 autom4te.cache
 stamp-h1
 .deps
+.vimrc
 elinks
 *.swp
 *.patch
--- 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)
--- a/config/.vimrc
+++ b/config/.vimrc
@ -1,2 +0,0 @@
-:set runtimepath+=.
-:runtime ../.vimrc
--- a/config/m4/.vimrc
+++ b/config/m4/.vimrc
@ -1,2 +0,0 @@
-:set runtimepath+=.
-:runtime ../../.vimrc
--- a/config/vimrc
+++ b/config/vimrc
@ -1,3 +1,5 @@
+" Master vimrc file for the ELinks project
+
 :set shiftwidth=8
 :set tabstop=8
 :set softtabstop=0
--- 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
--- a/debian/.vimrc
+++ b/debian/.vimrc
@ -1,2 +0,0 @@
-:set runtimepath+=.
-:runtime ../.vimrc
--- a/doc/.vimrc
+++ b/doc/.vimrc
@ -1,2 +0,0 @@
-:set runtimepath+=.
-:runtime ../.vimrc
--- a/doc/man/.vimrc
+++ b/doc/man/.vimrc
@ -1,2 +0,0 @@
-:set runtimepath+=.
-:runtime ../../.vimrc
--- a/doc/man/man1/.vimrc
+++ b/doc/man/man1/.vimrc
@ -1,2 +0,0 @@
-:set runtimepath+=.
-:runtime ../../../.vimrc
--- a/doc/man/man5/.vimrc
+++ b/doc/man/man5/.vimrc
@ -1,2 +0,0 @@
-:set runtimepath+=.
-:runtime ../../../.vimrc
--- a/doc/tools/.vimrc
+++ b/doc/tools/.vimrc
@ -1,2 +0,0 @@
-:set runtimepath+=.
-:runtime ../../.vimrc
--- a/po/.vimrc
+++ b/po/.vimrc
@ -1,2 +0,0 @@
-:set runtimepath+=.
-:runtime ../.vimrc
--- a/src/.vimrc
+++ b/src/.vimrc
@ -1,2 +0,0 @@
-:set runtimepath+=.
-:runtime ../.vimrc
--- a/src/bfu/.vimrc
+++ b/src/bfu/.vimrc
@ -1,2 +0,0 @@
-:set runtimepath+=.
-:runtime ../../.vimrc
--- a/src/bookmarks/.vimrc
+++ b/src/bookmarks/.vimrc
@ -1,2 +0,0 @@
-:set runtimepath+=.
-:runtime ../../.vimrc
--- a/src/bookmarks/backend/.vimrc
+++ b/src/bookmarks/backend/.vimrc
@ -1,2 +0,0 @@
-:set runtimepath+=.
-:runtime ../../../.vimrc
--- a/src/cache/.vimrc
+++ b/src/cache/.vimrc
@ -1,2 +0,0 @@
-:set runtimepath+=.
-:runtime ../../.vimrc
--- a/src/config/.vimrc
+++ b/src/config/.vimrc
@ -1,2 +0,0 @@
-:set runtimepath+=.
-:runtime ../../.vimrc
--- a/src/cookies/.vimrc
+++ b/src/cookies/.vimrc
@ -1,2 +0,0 @@
-:set runtimepath+=.
-:runtime ../../.vimrc
--- a/src/dialogs/.vimrc
+++ b/src/dialogs/.vimrc
@ -1,2 +0,0 @@
-:set runtimepath+=.
-:runtime ../../.vimrc
--- a/src/document/.vimrc
+++ b/src/document/.vimrc
@ -1,2 +0,0 @@
-:set runtimepath+=.
-:runtime ../../.vimrc
--- a/src/document/css/.vimrc
+++ b/src/document/css/.vimrc
@ -1,2 +0,0 @@
-:set runtimepath+=.
-:runtime ../../../.vimrc
--- a/src/document/dom/.vimrc
+++ b/src/document/dom/.vimrc
@ -1,2 +0,0 @@
-:set runtimepath+=.
-:runtime ../../../.vimrc
--- a/src/document/html/.vimrc
+++ b/src/document/html/.vimrc
@ -1,2 +0,0 @@
-:set runtimepath+=.
-:runtime ../../../.vimrc
--- a/src/document/html/parser/.vimrc
+++ b/src/document/html/parser/.vimrc
@ -1,2 +0,0 @@
-:set runtimepath+=.
-:runtime ../../../../.vimrc
--- a/src/document/plain/.vimrc
+++ b/src/document/plain/.vimrc
@ -1,2 +0,0 @@
-:set runtimepath+=.
-:runtime ../../../.vimrc
--- a/src/dom/.vimrc
+++ b/src/dom/.vimrc
@ -1,2 +0,0 @@
-:set runtimepath+=.
-:runtime ../../.vimrc
--- a/src/dom/css/.vimrc
+++ b/src/dom/css/.vimrc
@ -1,2 +0,0 @@
-:set runtimepath+=.
-:runtime ../../../.vimrc
--- a/src/dom/sgml/.vimrc
+++ b/src/dom/sgml/.vimrc
@ -1,2 +0,0 @@
-:set runtimepath+=.
-:runtime ../../../.vimrc
--- a/src/dom/sgml/docbook/.vimrc
+++ b/src/dom/sgml/docbook/.vimrc
@ -1,2 +0,0 @@
-:set runtimepath+=.
-:runtime ../../../.vimrc
--- a/src/dom/test/.vimrc
+++ b/src/dom/test/.vimrc
@ -1,2 +0,0 @@
-:set runtimepath+=.
-:runtime ../../../.vimrc
--- a/src/ecmascript/.vimrc
+++ b/src/ecmascript/.vimrc
@ -1,2 +0,0 @@
-:set runtimepath+=.
-:runtime ../../.vimrc
--- a/src/ecmascript/spidermonkey/.vimrc
+++ b/src/ecmascript/spidermonkey/.vimrc
@ -1,2 +0,0 @@
-:set runtimepath+=.
-:runtime ../../../.vimrc
--- a/src/encoding/.vimrc
+++ b/src/encoding/.vimrc
@ -1,2 +0,0 @@
-:set runtimepath+=.
-:runtime ../../.vimrc
--- a/src/formhist/.vimrc
+++ b/src/formhist/.vimrc
@ -1,2 +0,0 @@
-:set runtimepath+=.
-:runtime ../../.vimrc
--- a/src/globhist/.vimrc
+++ b/src/globhist/.vimrc
@ -1,2 +0,0 @@
-:set runtimepath+=.
-:runtime ../../.vimrc
--- a/src/intl/.vimrc
+++ b/src/intl/.vimrc
@ -1,2 +0,0 @@
-:set runtimepath+=.
-:runtime ../../.vimrc
--- a/src/intl/gettext/.vimrc
+++ b/src/intl/gettext/.vimrc
@ -1,2 +0,0 @@
-:set runtimepath+=.
-:runtime ../../../.vimrc
--- a/src/main/.vimrc
+++ b/src/main/.vimrc
@ -1,2 +0,0 @@
-:set runtimepath+=.
-:runtime ../../.vimrc
--- a/src/mime/.vimrc
+++ b/src/mime/.vimrc
@ -1,2 +0,0 @@
-:set runtimepath+=.
-:runtime ../../.vimrc
--- a/src/mime/backend/.vimrc
+++ b/src/mime/backend/.vimrc
@ -1,2 +0,0 @@
-:set runtimepath+=.
-:runtime ../../../.vimrc
--- a/src/network/.vimrc
+++ b/src/network/.vimrc
@ -1,2 +0,0 @@
-:set runtimepath+=.
-:runtime ../../.vimrc
--- a/src/network/ssl/.vimrc
+++ b/src/network/ssl/.vimrc
@ -1,2 +0,0 @@
-:set runtimepath+=.
-:runtime ../../../.vimrc
--- a/src/osdep/.vimrc
+++ b/src/osdep/.vimrc
@ -1,2 +0,0 @@
-:set runtimepath+=.
-:runtime ../../.vimrc
--- a/src/osdep/beos/.vimrc
+++ b/src/osdep/beos/.vimrc
@ -1,2 +0,0 @@
-:set runtimepath+=.
-:runtime ../../../.vimrc
--- a/src/osdep/os2/.vimrc
+++ b/src/osdep/os2/.vimrc
@ -1,2 +0,0 @@
-:set runtimepath+=.
-:runtime ../../../.vimrc
--- a/src/osdep/riscos/.vimrc
+++ b/src/osdep/riscos/.vimrc
@ -1,2 +0,0 @@
-:set runtimepath+=.
-:runtime ../../../.vimrc
--- a/src/osdep/unix/.vimrc
+++ b/src/osdep/unix/.vimrc
@ -1,2 +0,0 @@
-:set runtimepath+=.
-:runtime ../../../.vimrc
--- a/src/osdep/win32/.vimrc
+++ b/src/osdep/win32/.vimrc
@ -1,2 +0,0 @@
-:set runtimepath+=.
-:runtime ../../../.vimrc
--- a/src/protocol/.vimrc
+++ b/src/protocol/.vimrc
@ -1,2 +0,0 @@
-:set runtimepath+=.
-:runtime ../../.vimrc
--- a/src/protocol/auth/.vimrc
+++ b/src/protocol/auth/.vimrc
@ -1,2 +0,0 @@
-:set runtimepath+=.
-:runtime ../../../.vimrc
--- a/src/protocol/bittorrent/.vimrc
+++ b/src/protocol/bittorrent/.vimrc
@ -1,2 +0,0 @@
-:set runtimepath+=.
-:runtime ../../../.vimrc
--- a/src/protocol/file/.vimrc
+++ b/src/protocol/file/.vimrc
@ -1,2 +0,0 @@
-:set runtimepath+=.
-:runtime ../../../.vimrc
--- a/src/protocol/finger/.vimrc
+++ b/src/protocol/finger/.vimrc
@ -1,2 +0,0 @@
-:set runtimepath+=.
-:runtime ../../../.vimrc
--- a/src/protocol/ftp/.vimrc
+++ b/src/protocol/ftp/.vimrc
@ -1,2 +0,0 @@
-:set runtimepath+=.
-:runtime ../../../.vimrc
--- a/src/protocol/gopher/.vimrc
+++ b/src/protocol/gopher/.vimrc
@ -1,2 +0,0 @@
-:set runtimepath+=.
-:runtime ../../../.vimrc
--- a/src/protocol/http/.vimrc
+++ b/src/protocol/http/.vimrc
@ -1,2 +0,0 @@
-:set runtimepath+=.
-:runtime ../../../.vimrc
--- a/src/protocol/nntp/.vimrc
+++ b/src/protocol/nntp/.vimrc
@ -1,2 +0,0 @@
-:set runtimepath+=.
-:runtime ../../../.vimrc
--- a/src/protocol/rewrite/.vimrc
+++ b/src/protocol/rewrite/.vimrc
@ -1,2 +0,0 @@
-:set runtimepath+=.
-:runtime ../../../.vimrc
--- a/src/protocol/smb/.vimrc
+++ b/src/protocol/smb/.vimrc
@ -1,2 +0,0 @@
-:set runtimepath+=.
-:runtime ../../../.vimrc
--- a/src/scripting/.vimrc
+++ b/src/scripting/.vimrc
@ -1,2 +0,0 @@
-:set runtimepath+=.
-:runtime ../../.vimrc
--- a/src/scripting/guile/.vimrc
+++ b/src/scripting/guile/.vimrc
@ -1,2 +0,0 @@
-:set runtimepath+=.
-:runtime ../../../.vimrc
--- a/src/scripting/lua/.vimrc
+++ b/src/scripting/lua/.vimrc
@ -1,2 +0,0 @@
-:set runtimepath+=.
-:runtime ../../../.vimrc
--- a/src/scripting/perl/.vimrc
+++ b/src/scripting/perl/.vimrc
@ -1,2 +0,0 @@
-:set runtimepath+=.
-:runtime ../../../.vimrc
--- a/src/scripting/python/.vimrc
+++ b/src/scripting/python/.vimrc
@ -1,2 +0,0 @@
-:set runtimepath+=.
-:runtime ../../../.vimrc
--- a/src/scripting/ruby/.vimrc
+++ b/src/scripting/ruby/.vimrc
@ -1,2 +0,0 @@
-:set runtimepath+=.
-:runtime ../../../.vimrc
--- a/src/session/.vimrc
+++ b/src/session/.vimrc
@ -1,2 +0,0 @@
-:set runtimepath+=.
-:runtime ../../.vimrc
--- a/src/terminal/.vimrc
+++ b/src/terminal/.vimrc
@ -1,2 +0,0 @@
-:set runtimepath+=.
-:runtime ../../.vimrc
--- a/src/util/.vimrc
+++ b/src/util/.vimrc
@ -1,2 +0,0 @@
-:set runtimepath+=.
-:runtime ../../.vimrc
--- a/src/viewer/.vimrc
+++ b/src/viewer/.vimrc
@ -1,2 +0,0 @@
-:set runtimepath+=.
-:runtime ../../.vimrc
--- a/src/viewer/dump/.vimrc
+++ b/src/viewer/dump/.vimrc
@ -1,2 +0,0 @@
-:set runtimepath+=.
-:runtime ../../../.vimrc
--- a/src/viewer/text/.vimrc
+++ b/src/viewer/text/.vimrc
@ -1,2 +0,0 @@
-:set runtimepath+=.
-:runtime ../../../.vimrc