dmbcs/mcron
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

build: Handle all programs names transformations

Browse source 
Previously only prepending a prefix was handled when installing 'crontab'.
Using the 'transform' Make macro allows the installation process to support
generic transformations as defined by the '--program-suffix' and
'--program-transform-name' configure options.

* configure.ac: Don't substitue '@real_program_prefix@'.
* Makefile.am (fpp): Remove.
(transform_exe): New macro.
[MULTI_USER] (install-exec-hook): Use it when installing 'crontab'.
This commit is contained in:
Mathieu Lirzin 2018-03-19 23:31:30 +01:00
commit dd9d6a6b06
No known key found for this signature in database
GPG key ID: 0ADEE10094604D37
2 changed files with 4 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Makefile.am
View file

@ -172,12 +172,13 @@ EXTRA_DIST = \
## Installation. ## ## Installation. ##
## -------------- ## ## -------------- ##
#full program prefix # Sed command for Transforming program names.
fpp = $(DESTDIR)$(bindir)/@real_program_prefix@ transform_exe = s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/
if MULTI_USER if MULTI_USER
install-exec-hook: install-exec-hook:
chmod u+s $(fpp)crontab$(EXEEXT) tcrontab=`echo crontab$(EXEEXT) | sed '$(transform_exe)'`; \
chmod u+s $(DESTDIR)$(bindir)/$${tcrontab}
endif endif
## --------------- ## ## --------------- ##

8
configure.ac
View file

@ -133,14 +133,6 @@ AC_ARG_WITH(tmp-dir,
AC_MSG_RESULT($CONFIG_TMP_DIR) AC_MSG_RESULT($CONFIG_TMP_DIR)
AC_SUBST(CONFIG_TMP_DIR) AC_SUBST(CONFIG_TMP_DIR)
# This is to support `make DESTDIR=...'
real_program_prefix=`echo $program_prefix | sed s/NONE//`
AC_SUBST(real_program_prefix)
AC_CONFIG_FILES([pre-inst-env:build-aux/pre-inst-env.in], AC_CONFIG_FILES([pre-inst-env:build-aux/pre-inst-env.in],
[chmod +x pre-inst-env]) [chmod +x pre-inst-env])
AC_CONFIG_FILES([doc/config.texi AC_CONFIG_FILES([doc/config.texi