build-sys: make path of loadkeys/setfont configurable in configure

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 94ae549b8f90ed15c077b124ab025a6684889189..b11dfb95efe564bb2051091828209db7ae0f9263 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -167,47 +167,6 @@ AM_CPPFLAGS = \
 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 \
@@ -406,34 +365,15 @@ EXTRA_DIST += \
        units/systemd-modules-load.service.in
 endif
 
-if TARGET_FEDORA
-dist_systemunit_DATA += \
-       units/fedora/rc-local.service \
-       units/fedora/halt-local.service
-systemgenerator_PROGRAMS += \
-       systemd-rc-local-generator
-endif
-
-if TARGET_MANDRIVA
-dist_systemunit_DATA += \
-       units/fedora/rc-local.service \
-       units/fedora/halt-local.service
-systemgenerator_PROGRAMS += \
-       systemd-rc-local-generator
-endif
+if HAVE_SYSV_COMPAT
+nodist_systemunit_DATA += \
+       units/rc-local.service \
+       units/halt-local.service
 
-if TARGET_SUSE
-dist_systemunit_DATA += \
-       units/suse/rc-local.service \
-       units/suse/halt-local.service
-systemgenerator_PROGRAMS += \
-       systemd-rc-local-generator
-endif
+EXTRA_DIST += \
+       units/rc-local.service.in \
+       units/halt-local.service.in
 
-if TARGET_MAGEIA
-dist_systemunit_DATA += \
-       units/fedora/rc-local.service \
-       units/fedora/halt-local.service
 systemgenerator_PROGRAMS += \
        systemd-rc-local-generator
 endif
@@ -3856,6 +3796,8 @@ SED_PROCESS = \
                -e 's,@QUOTACHECK\@,$(QUOTACHECK),g' \
                -e 's,@SYSTEM_SYSVINIT_PATH\@,$(sysvinitdir),g' \
                -e 's,@VARLOGDIR\@,$(varlogdir),g' \
+               -e 's,@RC_LOCAL_SCRIPT_PATH_START\@,$(RC_LOCAL_SCRIPT_PATH_START),g' \
+               -e 's,@RC_LOCAL_SCRIPT_PATH_STOP\@,$(RC_LOCAL_SCRIPT_PATH_STOP),g' \
                < $< > $@
 
 units/%: units/%.in Makefile
@@ -4133,12 +4075,6 @@ if TARGET_MANDRIVA
                $(LN_S) rescue.service single.service )
 endif
 
-if TARGET_SUSE
-       ( cd $(DESTDIR)$(systemunitdir) && \
-               rm -f local.service && \
-               $(LN_S) rc-local.service local.service )
-endif
-
 if TARGET_MAGEIA
        ( cd $(DESTDIR)$(systemunitdir) && \
                rm -f display-manager.service )