diff options
| author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-09-01 01:46:47 +0200 |
|---|---|---|
| committer | Jim Meyering <meyering@redhat.com> | 2012-09-01 21:28:12 +0200 |
| commit | 380d9da0b01c86aa11a7e83279fe7baebed6aad7 (patch) | |
| tree | 691fe1d6a38a735058dc1bea0e2bf8197a5f8530 /configure.ac | |
| parent | f49744040d33b453a6a414c4e8a29602bfdbb1f3 (diff) | |
| download | coreutils-380d9da0b01c86aa11a7e83279fe7baebed6aad7.tar.xz | |
build: simplify: get rid of some indirection variables
The code deciding which coreutils programs to build (depending on
defaults, system capabilities, and user requests) is overly complex
and rather confusing. Let's begin simplifying it by removing some
non-strictly-necessary indirection variables.
* configure.ac: Adjust and improve few comments.
(OPTIONAL_BIN_PROGS, OPTIONAL_PKGLIB_PROGS): Rename ...
(bin_PROGRAMS, pkglibexec_PROGRAMS): ... like these, respectively.
Ensure they aren't initialized in all Makefiles (which would lead
to spurious errors), by calling AM_SUBST_NOTMAKE on them.
* src/local.mk: Adjust and improve few comments.
(bin_PROGRAMS, pkglibexec_PROGRAMS): Simply define
to the corresponding '@substitution@'.
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/configure.ac b/configure.ac index f169a44a9..bfc5219a4 100644 --- a/configure.ac +++ b/configure.ac @@ -440,22 +440,25 @@ MAN=` done` NO_INSTALL_PROGS_DEFAULT=$no_install_progs_default -OPTIONAL_PKGLIB_PROGS=` - for p in $optional_pkglib_progs; do echo src/$p; done` + +# The programs built and installed by "make && make install". # Since this is AC_SUBST'd, Automake won't be able to perform rewrite -# with $(EXEEXT) appending on it, so we have to do it ourselves. -OPTIONAL_BIN_PROGS=` +# with $(EXEEXT) appending on it, so we have to do it ourselves -- in +# this case, only for $(bin_PROGRAMS). +bin_PROGRAMS=` for p in $optional_bin_progs; do echo "src/$p\$(EXEEXT)"; done` +pkglibexec_PROGRAMS=` + for p in $optional_pkglib_progs; do echo src/$p; done` # Normalize whitespace. MAN=`echo $MAN` NO_INSTALL_PROGS_DEFAULT=`echo $NO_INSTALL_PROGS_DEFAULT` -OPTIONAL_BIN_PROGS=`echo $OPTIONAL_BIN_PROGS` -OPTIONAL_PKGLIB_PROGS=`echo $OPTIONAL_PKGLIB_PROGS` +bin_PROGRAMS=`echo $bin_PROGRAMS` +pkglibexec_PROGS=`echo $pkglibexec_PROGRAMS` AC_SUBST([NO_INSTALL_PROGS_DEFAULT]) -AC_SUBST([OPTIONAL_BIN_PROGS]) -AC_SUBST([OPTIONAL_PKGLIB_PROGS]) +AC_SUBST([bin_PROGRAMS]) AM_SUBST_NOTMAKE([bin_PROGRAMS]) +AC_SUBST([pkglibexec_PROGRAMS]) AM_SUBST_NOTMAKE([pkglibexec_PROGRAMS]) AM_CONDITIONAL([CROSS_COMPILING], [test "$cross_compiling" = yes]) |