[SCM] Vim packaging branch, debian, updated. upstream/7.2.148-1043-ga66ad6b

[James Vega]

The following commit has been merged in the debian branch:
commit a66ad6b4f51bb4c7a9f9d6fb5205326c976a0f54
Author: James Vega <jamessan at debian.org>
Date:   Thu Jul 2 00:21:46 2009 -0400

    Set VIMRCLOC to /etc/vim
    
    Building Vim with this set allows it to know where the vimrc files are even if
    /usr isn't mounted.  This will be particularly useful when vim-tiny is moved
    to /bin.  The symlinks in /usr/share/vim are now useless, so they're also
    removed.
    
    Signed-off-by: James Vega <jamessan at debian.org>

diff --git a/debian/rules b/debian/rules
index 273ad7a..992a943 100755
--- a/debian/rules
+++ b/debian/rules
@@ -254,7 +254,7 @@ build-stamp-%: configure-stamp-%
 	dh_testdir
 	dh_clean -p$* -k
 	@echo "*** DEBIAN *** BUILDING VARIANT $*"
-	$(MAKE) -C src/$(SHADOWDIR) CFLAGS="$(CURCFLAGS)"
+	$(MAKE) -C src/$(SHADOWDIR) CFLAGS="$(CURCFLAGS)" VIMRCLOC="/etc/vim"
 	mv src/$(SHADOWDIR)/vim src/$(SHADOWDIR)/$(subst -,.,$*)
 	touch $@
 
@@ -281,13 +281,14 @@ install-stamp-vim-basic: build-stamp-vim-basic $(DOT_IN_DEPS)
 	
 	# UPSTREAM INSTALLATION
 	
-	$(MAKE) -C src/vim-basic DESTDIR=$(DESTDIR) installvimbin \
-	                                            installtutorbin \
-	                                            installgtutorbin \
-	                                            installruntime \
-	                                            installtools \
-	                                            install-icons \
-	                                            install-languages
+	$(MAKE) -C src/vim-basic VIMRCLOC="/etc/vim" DESTDIR="$(DESTDIR)" \
+	    installvimbin \
+	    installtutorbin \
+	    installgtutorbin \
+	    installruntime \
+	    installtools \
+	    install-icons \
+	    install-languages
 	
 # Tests need to be run in series, otherwise the terminal requests may not see
 # proper responses
diff --git a/debian/vim-common.links.in b/debian/vim-common.links.in
index 0050695..1353ff2 100644
--- a/debian/vim-common.links.in
+++ b/debian/vim-common.links.in
@@ -1,5 +1,4 @@
 etc/vim					usr/share/vim/vimfiles
-etc/vim/vimrc				usr/share/vim/vimrc
 usr/share/vim/@VIMCUR@			usr/share/vim/vimcurrent
 usr/share/man/man1/vim.1		usr/share/man/man1/rvim.1
 usr/share/man/man1/vim.1		usr/share/man/man1/rview.1
diff --git a/debian/vim-gui-common.links.in b/debian/vim-gui-common.links.in
index dc9a8cd..6f0f436 100644
--- a/debian/vim-gui-common.links.in
+++ b/debian/vim-gui-common.links.in
@@ -1,4 +1,3 @@
-etc/vim/gvimrc				usr/share/vim/gvimrc
 usr/share/man/man1/gvim.1		usr/share/man/man1/gview.1
 usr/share/man/man1/gvim.1		usr/share/man/man1/rgvim.1
 usr/share/man/man1/gvim.1		usr/share/man/man1/rgview.1

-- 
Vim packaging