diff options
| author | Neil Jerram <neil@ossau.uklinux.net> | 2011-03-20 23:50:22 +0000 |
|---|---|---|
| committer | Neil Jerram <neil@ossau.uklinux.net> | 2011-03-25 19:45:14 +0000 |
| commit | 6b8bc6f8b507928f9b0bd71000f5132c984db798 (patch) | |
| tree | c6fdc8b2dd0851291b6ba800870727a4d0aa1639 /am | |
| parent | aab99f7b8b74204993c7b9f8bc4ac3703551028b (diff) | |
Inline the effect of am/pre-inst-guile
It's just one variable definition, and in my opinion it confuses,
rather than helps, the overall build picture to have two names
(preinstguile and meta/guile) for the same thing.
* am/Makefile.am (am_frags): Remove pre-inst-guile.
* am/pre-inst-guile: Deleted.
* doc/ref/Makefile.am: Don't include am/pre-inst-guile.
($(snarf_doc).am, $(snarf_doc).texi): Expand $(preinstguile).
* module/Makefile.am (ice-9/psyntax-pp.scm.gen): Don't include
am/pre-inst-guile.
(ice-9/psyntax-pp.scm.gen): Expand $(preinstguile).
Diffstat (limited to 'am')
| -rw-r--r-- | am/Makefile.am | 2 | ||||
| -rw-r--r-- | am/pre-inst-guile | 33 |
2 files changed, 1 insertions, 34 deletions
diff --git a/am/Makefile.am b/am/Makefile.am index d1b7eccc7..e2044d6aa 100644 --- a/am/Makefile.am +++ b/am/Makefile.am @@ -21,7 +21,7 @@ AUTOMAKE_OPTIONS = gnu -am_frags = pre-inst-guile maintainer-dirs guilec +am_frags = maintainer-dirs guilec EXTRA_DIST = $(am_frags) ChangeLog-2008 diff --git a/am/pre-inst-guile b/am/pre-inst-guile deleted file mode 100644 index b7b0d3469..000000000 --- a/am/pre-inst-guile +++ /dev/null @@ -1,33 +0,0 @@ -## am/pre-inst-guile --- define preinstguile - -## Copyright (C) 2002, 2006, 2011 Free Software Foundation -## -## This file is part of GUILE. -## -## GUILE is free software; you can redistribute it and/or modify -## it under the terms of the GNU Lesser General Public License as -## published by the Free Software Foundation; either version 3, or -## (at your option) any later version. -## -## GUILE 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 Lesser General Public License for more details. -## -## You should have received a copy of the GNU Lesser General Public -## License along with GUILE; see the file COPYING.LESSER. If not, write -## to the Free Software Foundation, Inc., 51 Franklin Street, Fifth -## Floor, Boston, MA 02110-1301 USA - -## Commentary: - -## This fragment defines the preinstguile variable -## It can be included in any Makefile.am by adding the line: -## include $(top_srcdir)/am/pre-inst-guile -## See devel/build/pre-inst-guile.text (CVS only) for more info. - -## Code: - -preinstguile = $(top_builddir_absolute)/meta/guile - -## am/pre-inst-guile ends here |