From: Lucas De Marchi Date: Wed, 18 Jan 2012 18:02:45 +0000 (-0200) Subject: build-sys: move modprobe to sbindir X-Git-Tag: v5~82 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1592b0efdf6947eebf4f020694376fdb83198a85;p=thirdparty%2Fkmod.git build-sys: move modprobe to sbindir --- diff --git a/Makefile.am b/Makefile.am index 6eec0d84..46e15f75 100644 --- a/Makefile.am +++ b/Makefile.am @@ -104,6 +104,10 @@ if BUILD_TOOLS ln -s kmod $(DESTDIR)$(bindir)/modprobe ln -s kmod $(DESTDIR)$(bindir)/modinfo ln -s kmod $(DESTDIR)$(bindir)/depmod + $(MKDIR_P) $(DESTDIR)$(sbindir) && \ + relpath=$$(tools/shortest-relpath $(DESTDIR)$(bindir)/kmod $(DESTDIR)$(sbindir)) && \ + cd $(DESTDIR)$(sbindir) && \ + ln -sf $$relpath modprobe endif uninstall-hook: @@ -124,14 +128,14 @@ tools_kmod_CFLAGS = $(AM_CFLAGS) tools_kmod_LDADD = libkmod/libkmod-util.la \ libkmod/libkmod.la -noinst_PROGRAMS = tools/kmod-nolib scripts/shortest_relpath +noinst_PROGRAMS = tools/kmod-nolib tools/shortest-relpath tools_kmod_nolib_SOURCES = $(tools_kmod_SOURCES) tools_kmod_nolib_CPPFLAGS = $(tools_kmod_CPPFLAGS) tools_kmod_nolib_CFLAGS = $(tools_kmod_CFLAGS) tools_kmod_nolib_LDADD = libkmod/libkmod-util.la \ libkmod/libkmod-private.la -scripts_shortest_relpath_SOURCES = scripts/shortest_relpath.c +tools_shortest_relpath_SOURCES = tools/shortest-relpath.c ${noinst_SCRIPTS}: tools/kmod-nolib $(AM_V_GEN) ($(RM) $@; \