diff options
| -rw-r--r-- | configure.ac | 19 | ||||
| -rw-r--r-- | src/local.mk | 7 |
2 files changed, 15 insertions, 11 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]) diff --git a/src/local.mk b/src/local.mk index df09f0241..e127c7497 100644 --- a/src/local.mk +++ b/src/local.mk @@ -29,12 +29,13 @@ EXTRA_PROGRAMS = \ $(build_if_possible__progs) \ $(default__progs) -bin_PROGRAMS = $(OPTIONAL_BIN_PROGS) +# The user can tweak these lists at configure time. +bin_PROGRAMS = @bin_PROGRAMS@ +pkglibexec_PROGRAMS = @pkglibexec_PROGRAMS@ +# Needed by the testsuite. noinst_PROGRAMS = src/setuidgid src/getlimits -pkglibexec_PROGRAMS = $(OPTIONAL_PKGLIB_PROGS) - noinst_HEADERS = \ src/chown-core.h \ src/copy.h \ |