X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=config%2Fsrclistvars.sh;h=4756d5637388f5ee2149362377e621d19d2a8a29;hb=5b89c4d735274de30f40daaad3b4ba1bd1d2d82b;hp=957ce8abe9443b8abb8c66979e9aaa94c83a9005;hpb=cfa9aacf764d12705ce89977771138d2bc8bc690;p=gnulib.git

diff --git a/config/srclistvars.sh b/config/srclistvars.sh
index 957ce8abe..4756d5637 100644
--- a/config/srclistvars.sh
+++ b/config/srclistvars.sh
@@ -1,55 +1,42 @@
-# $Id: srclistvars.sh,v 1.28 2006-08-22 19:38:57 eggert Exp $
 # Variables for srclist-update and srclist.txt.
 # Will change for each user.
 
-# Copyright (C) 2002, 2003, 2004 2005, 2006 Free Software Foundation,
-# Inc.
+# Copyright (C) 2002, 2003, 2004 2005, 2006, 2008
+# Free Software Foundation, Inc.
 
-# This file is free software; you can redistribute it and/or modify it
+# This file is free software: you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+# per-user overrides.
 case $LOGNAME in
-jas | eggert)
-  : ${AUTOCONF=../autoconf}
-  : ${AUTOMAKE=../automake}
-  : ${GETTEXT=../gettext}
-  : ${GNUCONFIG=../config}
-  : ${GNUORG=../gnuorg}
-  : ${GNUWWWLICENSES=$GNUORG}
-  : ${GNUSTANDARDS=../gnustandards}
-  : ${LIBTOOL=../libtool}
-  : ${LIBCSRC=../libc}
-  : ${TEXINFOSRC=../texinfo}
-  ;;
-
 karl)
   : ${ACLOCAL=/usr/local/gnu/share/aclocal}
   : ${GNUBIN=/usr/local/gnu/bin}
+  : ${GNUORG=$HOME/gnu/gnuorg}
   : ${GNUWWWLICENSES=$HOME/gnu/www/www/licenses}
   : ${TEXMFROOT=/usr/local/texmf/texmf-dist}
-  : ${AUTOCONF=../autoconf}
-  : ${AUTOMAKE=../automake}
-  : ${EMACSSRC=../emacs}
-  : ${GETTEXT=../gettext}
-  : ${GNUCONFIG=../config}
-  : ${GNUORG=$HOME/gnu/gnuorg}
-  : ${GNULIBSRC=../gnulib}
-  : ${GNUSTANDARDS=../gnustandards}
-  : ${LIBCSRC=../libc}
-  : ${LIBTOOL=../libtool}
-  : ${TEXINFOSRC=../texinfo}
   ;;
-
 esac
+
+# Default to sibling (of parent) directories.
+: ${AUTOCONF=../autoconf}
+: ${AUTOMAKE=../automake}
+: ${GETTEXT=../gettext}
+: ${GNUCONFIG=../config}
+: ${GNULIBSRC=../gnulib}
+: ${GNUORG=../gnuorg}
+: ${GNUSTANDARDS=../gnustandards}
+: ${GNUWWWLICENSES=$GNUORG}
+: ${LIBCSRC=../libc}
+: ${LIBTOOL=../libtool}
+: ${TEXINFOSRC=../texinfo}