[SCM] Vim packaging branch, debian, updated. upstream/7.2.148-1045-gac8c907
James Vega
jamessan at debian.org
Mon Jul 6 13:05:54 UTC 2009
The following commit has been merged in the debian branch:
commit ac8c90700addda8d3b83f156d495575187a557b8
Author: James Vega <jamessan at debian.org>
Date: Fri Jul 3 01:28:28 2009 -0400
debian/rules: Build Vim to look for its (g)vimrc at /etc/vim/(g)vimrc, not in $VIM
Building Vim with this set allows it to know where the vimrc files are even if
/usr isn't mounted. 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..87532fa 100755
--- a/debian/rules
+++ b/debian/rules
@@ -105,22 +105,25 @@ ifeq ($(origin VARIANT), command line)
VARIANTS = $(VARIANT) vim-basic
endif
-CFLAGS_vim-basic:=$(CFLAGS)
+CFLAGS_vimrc := -DSYS_VIMRC_FILE=\"/etc/vim/vimrc\"
+CFLAGS_gvimrc := -DSYS_GVIMRC_FILE=\"/etc/vim/gvimrc\"
+
+CFLAGS_vim-basic:=$(CFLAGS) $(CFLAGS_vimrc)
CFGFLAGS_vim-basic:=$(CFGFLAGS) $(OPTFLAGS) $(NOXFLAGS) $(NOINTERPFLAGS)
-CFLAGS_vim-tiny:=$(CFLAGS) -DTINY_VIMRC
+CFLAGS_vim-tiny:=$(CFLAGS) $(CFLAGS_vimrc) -DTINY_VIMRC
CFGFLAGS_vim-tiny:=$(CFGFLAGS) $(TINYFLAGS)
-CFLAGS_vim-gtk:=$(CFLAGS)
+CFLAGS_vim-gtk:=$(CFLAGS) $(CFLAGS_vimrc) $(CFLAGS_gvimrc)
CFGFLAGS_vim-gtk:=$(CFGFLAGS) $(OPTFLAGS) $(GUIFLAGS) $(GTKFLAGS) $(ALLINTERPFLAGS)
-CFLAGS_vim-gnome:=$(CFLAGS)
+CFLAGS_vim-gnome:=$(CFLAGS) $(CFLAGS_vimrc) $(CFLAGS_gvimrc)
CFGFLAGS_vim-gnome:=$(CFGFLAGS) $(OPTFLAGS) $(GUIFLAGS) $(GNOMEFLAGS) $(ALLINTERPFLAGS)
-CFLAGS_vim-lesstif:=$(CFLAGS)
+CFLAGS_vim-lesstif:=$(CFLAGS) $(CFLAGS_vimrc) $(CFLAGS_gvimrc)
CFGFLAGS_vim-lesstif:=$(CFGFLAGS) $(OPTFLAGS) $(GUIFLAGS) $(LESSTIFFLAGS) $(ALLINTERPFLAGS)
-CFLAGS_vim-nox:=$(CFLAGS)
+CFLAGS_vim-nox:=$(CFLAGS) $(CFLAGS_vimrc)
CFGFLAGS_vim-nox:=$(CFGFLAGS) $(OPTFLAGS) $(NOXFLAGS) $(ALLINTERPFLAGS)
NAME:=vim
@@ -245,7 +248,7 @@ configure-stamp-%:
@echo "*** DEBIAN *** CONFIGURING VARIANT $*"
$(MAKE) -C src shadow SHADOWDIR=$(SHADOWDIR)
if test -f src/auto/config.cache; then make distclean; fi
- cd src/$(SHADOWDIR) && LDFLAGS="-Wl,--as-needed" CFLAGS="$(CFLAGS_$(*))" ./configure $(CFGFLAGS_$(*))
+ cd src/$(SHADOWDIR) && LDFLAGS="-Wl,--as-needed" CFLAGS='$(CFLAGS_$(*))' ./configure $(CFGFLAGS_$(*))
touch $@
build-stamp-%: CURCFLAGS=$(CFLAGS_$*)
@@ -254,7 +257,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)'
mv src/$(SHADOWDIR)/vim src/$(SHADOWDIR)/$(subst -,.,$*)
touch $@
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
More information about the pkg-vim-maintainers
mailing list