[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 3/5] config.scm.in: rename to config.scm.in.in, substitute from M
From: |
ulfvonbelow |
Subject: |
[PATCH 3/5] config.scm.in: rename to config.scm.in.in, substitute from Makefile. |
Date: |
Thu, 2 Feb 2023 19:29:50 +0000 |
* src/mcron/config.scm.in: renamed to config.scm.in.in.
(config-sbin-dir): new variable.
* Makefile.am: substitute in config.scm.in.
---
Makefile.am | 15 +++++++++------
configure.ac | 2 +-
src/mcron/{config.scm.in => config.scm.in.in} | 1 +
3 files changed, 11 insertions(+), 7 deletions(-)
rename src/mcron/{config.scm.in => config.scm.in.in} (97%)
diff --git a/Makefile.am b/Makefile.am
index a9ef5a9..4afd7f3 100755
--- a/Makefile.am
+++ b/Makefile.am
@@ -100,10 +100,7 @@ DISTCLEANFILES = src/mcron/config.scm
--warn=format --warn=unbound-variable --warn=arity-mismatch \
--target="$(host)" --output="$@" "$<" $(devnull_verbose)
-
-bin/% : src/%.in Makefile
- $(AM_V_GEN)$(MKDIR_P) bin ; \
- sed -e 's,%PREFIX%,${prefix},g' \
+do_subst = sed -e 's,%PREFIX%,${prefix},g' \
-e 's,%modsrcdir%,${guilesitedir},g' \
-e 's,%modbuilddir%,${guilesitegodir},g' \
-e 's,%localstatedir%,${localstatedir},g' \
@@ -114,8 +111,14 @@ bin/% : src/%.in Makefile
-e 's,%PACKAGE_BUGREPORT%,@PACKAGE_BUGREPORT@,g' \
-e 's,%PACKAGE_NAME%,@PACKAGE_NAME@,g' \
-e 's,%PACKAGE_URL%,@PACKAGE_URL@,g' \
- -e 's,%GUILE%,$(GUILE),g' \
- $< > $@ ; \
+ -e 's,%GUILE%,$(GUILE),g'
+
+src/mcron/config.scm: src/mcron/config.scm.in Makefile
+ $(AM_V_GEN)$(do_subst) $< > $@
+
+bin/% : src/%.in Makefile
+ $(AM_V_GEN)$(MKDIR_P) bin ; \
+ $(do_subst) $< > $@ ; \
chmod a+x $@
diff --git a/configure.ac b/configure.ac
index 451777d..7ea532f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -127,5 +127,5 @@ AC_CONFIG_FILES([pre-inst-env:build-aux/pre-inst-env.in],
[chmod +x pre-inst-env])
AC_CONFIG_FILES([doc/config.texi
Makefile
- src/mcron/config.scm])
+ src/mcron/config.scm.in])
AC_OUTPUT
diff --git a/src/mcron/config.scm.in b/src/mcron/config.scm.in.in
similarity index 97%
rename from src/mcron/config.scm.in
rename to src/mcron/config.scm.in.in
index e6a0e07..769a913 100644
--- a/src/mcron/config.scm.in
+++ b/src/mcron/config.scm.in.in
@@ -26,6 +26,7 @@
(define-public config-package-url "@PACKAGE_URL@")
(define-public config-sendmail "@SENDMAIL@")
+(define-public config-sbin-dir "%sbindir%")
(define-public config-spool-dir "@CONFIG_SPOOL_DIR@")
(define-public config-socket-file "@CONFIG_SOCKET_FILE@")
(define-public config-allow-file "@CONFIG_ALLOW_FILE@")
--
2.38.1
- [PATCH 0/5] Make vixie cron mode actually work, and work safely, ulfvonbelow, 2023/02/02
- [PATCH 2/5] Makefile.am: don't install cron as setuid., ulfvonbelow, 2023/02/02
- [PATCH 4/5] crontab: split into crontab and setuid helper crontab-access., ulfvonbelow, 2023/02/02
- [PATCH 5/5] crontab-access: replace with wrapper, rename to crontab-access-real., ulfvonbelow, 2023/02/02
- [PATCH 1/5] cron: use signal numbers instead of symbols., ulfvonbelow, 2023/02/02
- [PATCH 3/5] config.scm.in: rename to config.scm.in.in, substitute from Makefile.,
ulfvonbelow <=