diff options
| author | Lennart Poettering <lennart@poettering.net> | 2013-01-04 23:19:02 +0100 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2013-01-04 23:26:21 +0100 |
| commit | a382332eed10d3348231803c47a4c599d24c5e3a (patch) | |
| tree | 9629fce80ac4b430961ea5f76a3c9a469b4863fc | |
| parent | 425c608d5319cae993d786a3915064bbb580c17b (diff) | |
build-sys: make path of loadkeys/setfont configurable in configure
| -rw-r--r-- | Makefile.am | 41 | ||||
| -rw-r--r-- | configure.ac | 19 |
2 files changed, 19 insertions, 41 deletions
diff --git a/Makefile.am b/Makefile.am index 9132ccdfc3..b11dfb95ef 100644 --- a/Makefile.am +++ b/Makefile.am @@ -168,47 +168,6 @@ AM_CFLAGS = $(OUR_CFLAGS) AM_LDFLAGS = $(OUR_LDFLAGS) # ------------------------------------------------------------------------------ -if TARGET_GENTOO -AM_CPPFLAGS += \ - -DKBD_LOADKEYS=\"/usr/bin/loadkeys\" \ - -DKBD_SETFONT=\"/usr/bin/setfont\" -else -if TARGET_ARCH -AM_CPPFLAGS += \ - -DKBD_LOADKEYS=\"/usr/bin/loadkeys\" \ - -DKBD_SETFONT=\"/usr/bin/setfont\" -else -if TARGET_FRUGALWARE -AM_CPPFLAGS += \ - -DKBD_LOADKEYS=\"/usr/bin/loadkeys\" \ - -DKBD_SETFONT=\"/usr/bin/setfont\" -else -if TARGET_MANDRIVA -AM_CPPFLAGS += \ - -DKBD_LOADKEYS=\"/bin/loadkeys\" \ - -DKBD_SETFONT=\"/bin/setfont\" -else -if TARGET_ANGSTROM -AM_CPPFLAGS += \ - -DKBD_LOADKEYS=\"/usr/bin/loadkeys\" \ - -DKBD_SETFONT=\"/usr/bin/setfont\" -else -if TARGET_MAGEIA -AM_CPPFLAGS += \ - -DKBD_LOADKEYS=\"/bin/loadkeys\" \ - -DKBD_SETFONT=\"/bin/setfont\" -else -AM_CPPFLAGS += \ - -DKBD_LOADKEYS=\"/bin/loadkeys\" \ - -DKBD_SETFONT=\"/bin/setfont\" -endif -endif -endif -endif -endif -endif - -# ------------------------------------------------------------------------------ rootbin_PROGRAMS = \ systemctl \ systemd-notify \ diff --git a/configure.ac b/configure.ac index a39dd6a33c..2f457fc8cf 100644 --- a/configure.ac +++ b/configure.ac @@ -627,6 +627,25 @@ AC_SUBST(RC_LOCAL_SCRIPT_PATH_START) AC_SUBST(RC_LOCAL_SCRIPT_PATH_STOP) # ------------------------------------------------------------------------------ +AC_ARG_WITH(kbd-loadkeys, + AS_HELP_STRING([--with-kbd-loadkeys=PATH], + [Path to loadkeys]), + [KBD_LOADKEYS="$withval"], + [KBD_LOADKEYS="/usr/bin/loadkeys"]) + +AC_ARG_WITH(kbd-setfont, + AS_HELP_STRING([--with-kbd-setfont=PATH], + [Path to setfont]), + [KBD_SETFONT="$withval"], + [KBD_SETFONT="/usr/bin/setfont"]) + +AC_DEFINE_UNQUOTED(KBD_LOADKEYS, ["$KBD_LOADKEYS"], [Path of loadkeys]) +AC_DEFINE_UNQUOTED(KBD_SETFONT, ["$KBD_SETFONT"], [Path of setfont]) + +AC_SUBST(KBD_LOADKEYS) +AC_SUBST(KBD_SETFONT) + +# ------------------------------------------------------------------------------ AC_ARG_WITH(firmware-path, AS_HELP_STRING([--with-firmware-path=DIR[[[:DIR[...]]]]], [Firmware search path (default=ROOTPREFIX/lib/firmware/updates:ROOTPREFIX/lib/firmware)]), |