Merge branch 'develop' into mplegendre-multi_pkgsrc_roots

Conflicts:
	lib/spack/spack/cmd/create.py
	lib/spack/spack/cmd/extensions.py
	lib/spack/spack/cmd/fetch.py
	lib/spack/spack/cmd/uninstall.py
	lib/spack/spack/config.py
	lib/spack/spack/database.py
	lib/spack/spack/directory_layout.py
	lib/spack/spack/packages.py
	lib/spack/spack/spec.py

var/spack/repos/builtin/packages/texinfo/package.py

@@ -0,0 +1,46 @@
+##############################################################################
+# Copyright (c) 2013, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Written by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://llnl.github.io/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program 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) version 2.1 dated February 1999.
+#
+# 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 terms and
+# conditions of the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software Foundation,
+# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+
+from spack import *
+
+
+class Texinfo(Package):
+    """
+    Texinfo is the official documentation format of the GNU project. It was invented by Richard Stallman and Bob
+    Chassell many years ago, loosely based on Brian Reid's Scribe and other formatting languages of the time. It is
+    used by many non-GNU projects as well.FIXME: put a proper description of your package here.
+    """
+    homepage = "https://www.gnu.org/software/texinfo/"
+    url      = "http://ftp.gnu.org/gnu/texinfo/texinfo-6.0.tar.xz"
+
+    version('6.0', '02818e62a5b8ae0213a7ff572991bb50')
+    version('5.2', 'cb489df8a7ee9d10a236197aefdb32c5')
+    version('5.1', '52ee905a3b705020d2a1b6ec36d53ca6')
+    version('5.0', 'ef2fad34c71ddc95b20c7d6a08c0d7a6')
+
+    def install(self, spec, prefix):
+        configure('--prefix=%s' % prefix)
+        make()
+        make("install")