diff options
| author | Laurent Bercot <ska-skaware@skarnet.org> | 2025-04-28 03:28:56 +0000 |
|---|---|---|
| committer | Laurent Bercot <ska@appnovation.com> | 2025-04-28 03:28:56 +0000 |
| commit | 63ae0841dcc024464290edf9080ce536a1d7905e (patch) | |
| tree | d93fe732743e54ee4b45528341c12d6a4470d808 /tools | |
| parent | 7dda4a124069438acb19a419a088f5c1ab9b4670 (diff) | |
| download | s6-63ae0841dcc024464290edf9080ce536a1d7905e.tar.gz | |
Document s6-softlimit -H|-h
Signed-off-by: Laurent Bercot <ska@appnovation.com>
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/configure.template | 7 | ||||
| -rwxr-xr-x | tools/gen-configure.el | 1 |
2 files changed, 7 insertions, 1 deletions
diff --git a/tools/configure.template b/tools/configure.template index dd449d0..f9faa60 100755 --- a/tools/configure.template +++ b/tools/configure.template @@ -240,7 +240,7 @@ done # Process deps-build if test -n "$pkgconf" || $pcw || $slashpackage ; then oldifs="$IFS" - while IFS=" " read cond usedinlibs pkg ver libs ; do + while IFS=" " read cond usedinlibs pkg ver libs ; do IFS="$oldifs" eval "cond=$cond; usedinlibs=$usedinlibs" if $cond ; then @@ -418,6 +418,8 @@ else LDFLAGS_NOSHARED="${LDFLAGS_NOSHARED}${addlibdpath}" fi +${configure_extra_checks} + echo "Creating config.mak..." cmdline=$(quote "$0") for i ; do cmdline="$cmdline $(quote "$i")" ; done @@ -513,12 +515,15 @@ EOF if $slashpackage ; then echo "#define ${package_macro_name}_BINPREFIX \"$bindir/\"" echo "#define ${package_macro_name}_EXTBINPREFIX \"$extbinprefix/\"" + echo "#define ${package_macro_name}_EXTLIBEXECPREFIX \"$extbinprefix/\"" elif $abspath ; then echo "#define ${package_macro_name}_BINPREFIX \"$bindir/\"" echo "#define ${package_macro_name}_EXTBINPREFIX \"$bindir/\"" + echo "#define ${package_macro_name}_EXTLIBEXECPREFIX \"$libexecdir/\"" else echo "#define ${package_macro_name}_BINPREFIX \"\"" echo "#define ${package_macro_name}_EXTBINPREFIX \"\"" + echo "#define ${package_macro_name}_EXTLIBEXECPREFIX \"$libexecdir/\"" fi echo "#define ${package_macro_name}_LIBEXECPREFIX \"$libexecdir/\"" ${configure_generate_configh} diff --git a/tools/gen-configure.el b/tools/gen-configure.el index 2017dc2..577d86f 100755 --- a/tools/gen-configure.el +++ b/tools/gen-configure.el @@ -16,6 +16,7 @@ multisubstitute importas -uS configure_case_lines importas -uS configure_expand_dirs importas -uS configure_slashpackage_other + importas -uS configure_extra_checks importas -uS configure_generate_make importas -uS configure_generate_configh } |