build: Move executable to "bin" directory.

* Makefile.am (bin_PROGRAMS, sbin_PROGRAMS): Prepend "bin/" to every program.
(mcron_SOURCES, mcron_CPPFLAGS, mcron_DEPENDENCIES): Rename to ...
(bin_mcron_SOURCES, bin_mcron_CPPFLAGS, bin_mcron_DEPENDENCIES): ... this.
(cron_SOURCES, cron_CPPFLAGS, cron_DEPENDENCIES): Rename to ...
(bin_cron_SOURCES, bin_cron_CPPFLAGS, bin_cron_DEPENDENCIES): ... this.
(crontab_SOURCES, crontab_CPPFLAGS, crontab_DEPENDENCIES): Rename to ...
(bin_crontab_SOURCES, bin_crontab_CPPFLAGS, bin_crontab_DEPENDENCIES):
($(srcdir)/doc/cron.8, $(srcdir)/doc/crontab.1, $(srcdir)/doc/mcron.1): Update
prerequisite.
* build-aux/pre-inst-env.in (PATH): Use "bin" directory.
* .gitignore: Update.
This commit is contained in:
Mathieu Lirzin 2016-12-28 23:30:18 +01:00
commit ea648c0730
No known key found for this signature in database
GPG key ID: 0ADEE10094604D37
3 changed files with 18 additions and 18 deletions

6
.gitignore vendored
View file

@ -5,6 +5,9 @@
*~
.deps
.dirstamp
/bin/cron
/bin/crontab
/bin/mcron
/build-aux/compile
/build-aux/config.guess
/build-aux/config.sub
@ -13,8 +16,6 @@
/build-aux/mdate-sh
/build-aux/missing
/build-aux/texinfo.tex
/cron
/crontab
/doc/config.texi
/doc/cron.8
/doc/crontab.1
@ -22,7 +23,6 @@
/doc/mcron.info
/doc/stamp-vti
/doc/version.texi
/mcron
/mdate-sh
/.version
INSTALL

View file

@ -17,24 +17,24 @@
# You should have received a copy of the GNU General Public License
# along with GNU Mcron. If not, see <http://www.gnu.org/licenses/>.
bin_PROGRAMS = mcron crontab
sbin_PROGRAMS = cron
bin_PROGRAMS = bin/mcron bin/crontab
sbin_PROGRAMS = bin/cron
AM_CPPFLAGS = -DPACKAGE_LOAD_PATH=\"$(moduledir)\"
AM_CFLAGS = @GUILE_CFLAGS@
LDADD = @GUILE_LIBS@
mcron_SOURCES = src/wrapper.c
mcron_CPPFLAGS = $(AM_CPPFLAGS) -DPROGRAM="\"mcron\""
mcron_DEPENDENCIES = $(modules:%.scm=%.go)
bin_mcron_SOURCES = src/wrapper.c
bin_mcron_CPPFLAGS = $(AM_CPPFLAGS) -DPROGRAM="\"mcron\""
bin_mcron_DEPENDENCIES = $(modules:%.scm=%.go)
cron_SOURCES = src/wrapper.c
cron_CPPFLAGS = $(AM_CPPFLAGS) -DPROGRAM="\"cron\""
cron_DEPENDENCIES = $(modules:%.scm=%.go)
bin_cron_SOURCES = src/wrapper.c
bin_cron_CPPFLAGS = $(AM_CPPFLAGS) -DPROGRAM="\"cron\""
bin_cron_DEPENDENCIES = $(modules:%.scm=%.go)
crontab_SOURCES = src/wrapper.c
crontab_CPPFLAGS = $(AM_CPPFLAGS) -DPROGRAM="\"crontab\""
crontab_DEPENDENCIES = $(modules:%.scm=%.go)
bin_crontab_SOURCES = src/wrapper.c
bin_crontab_CPPFLAGS = $(AM_CPPFLAGS) -DPROGRAM="\"crontab\""
bin_crontab_DEPENDENCIES = $(modules:%.scm=%.go)
dist_mcronmodule_DATA = \
src/mcron/base.scm \
@ -180,13 +180,13 @@ gen_man = \
*) : ;; \
esac
$(srcdir)/doc/mcron.1: src/mcron/scripts/mcron.scm mcron
$(srcdir)/doc/mcron.1: src/mcron/scripts/mcron.scm bin/mcron
-@prog="mcron"; man_section=1; $(gen_man)
$(srcdir)/doc/crontab.1: src/mcron/scripts/crontab.scm crontab
$(srcdir)/doc/crontab.1: src/mcron/scripts/crontab.scm bin/crontab
-@prog="crontab"; man_section=1; $(gen_man)
$(srcdir)/doc/cron.8: src/mcron/scripts/cron.scm cron
$(srcdir)/doc/cron.8: src/mcron/scripts/cron.scm bin/cron
-@prog="cron"; man_section=8; $(gen_man)
## -------------- ##

View file

@ -24,7 +24,7 @@ GUILE_LOAD_COMPILED_PATH="$abs_top_builddir/src${GUILE_LOAD_COMPILED_PATH:+:}$GU
GUILE_LOAD_PATH="$abs_top_builddir/src:$abs_top_srcdir/src${GUILE_LOAD_PATH:+:}:$GUILE_LOAD_PATH"
export GUILE_LOAD_COMPILED_PATH GUILE_LOAD_PATH
PATH="$abs_top_builddir:$PATH"
PATH="$abs_top_builddir/bin:$PATH"
export PATH
# Define $MCRON_UNINSTALLED to prevent 'mcron' from prepending @moduledir@ to