diff options
| author | Kay Sievers <kay.sievers@vrfy.org> | 2009-07-05 23:56:24 +0200 |
|---|---|---|
| committer | Kay Sievers <kay.sievers@vrfy.org> | 2009-07-05 23:56:24 +0200 |
| commit | 182c9b158495b55212651ed5e57d0d486a6ba781 (patch) | |
| tree | 75d93ea8ba8ed3f816a85d335a287bc46d10922f | |
| parent | 15106c483315faf737f560e833c2d3440af529ee (diff) | |
build: add *exec* to the internal rootlibdir name
Automake like variables with *exec* in the directory names,
to decide, that it isn't *data*:
http://www.gnu.org/software/hello/manual/automake/The-Two-Parts-of-Install.html#The-Two-Parts-of-Install
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | libudev/Makefile.am | 14 |
2 files changed, 9 insertions, 9 deletions
diff --git a/configure.ac b/configure.ac index 498c4c9ab9..96c10f7a62 100644 --- a/configure.ac +++ b/configure.ac @@ -15,7 +15,7 @@ AC_PATH_PROG([XSLTPROC], [xsltproc]) AC_ARG_WITH([rootlibdir], AS_HELP_STRING([--with-rootlibdir=DIR], [rootfs directory to install shared libraries]), [], [with_rootlibdir=$libdir]) -AC_SUBST([rootlibdir], [$with_rootlibdir]) +AC_SUBST([rootlib_execdir], [$with_rootlibdir]) AC_ARG_WITH([selinux], AS_HELP_STRING([--with-selinux], [enable SELinux support]), @@ -142,7 +142,7 @@ AC_MSG_RESULT([ sysconfdir: ${sysconfdir} sbindir: ${sbindir} libdir: ${libdir} - rootlibdir: ${rootlibdir} + rootlibdir: ${rootlib_execdir} libexecdir: ${libexecdir} datarootdir: ${datarootdir} diff --git a/libudev/Makefile.am b/libudev/Makefile.am index b50eac9628..3ed05a31e3 100644 --- a/libudev/Makefile.am +++ b/libudev/Makefile.am @@ -42,15 +42,15 @@ pkgconfig_DATA = \ EXTRA_DIST = \ exported_symbols -# move lib from $(libdir) to $(rootlibdir) and update devel link, if needed -install-data-hook: - if test "$(libdir)" != "$(rootlibdir)"; then \ - mkdir -p $(DESTDIR)$(rootlibdir) && \ +# move lib from $(libdir) to $(rootlib_execdir) and update devel link, if needed +install-exec-hook: + if test "$(libdir)" != "$(rootlib_execdir)"; then \ + mkdir -p $(DESTDIR)$(rootlib_execdir) && \ so_img_name=$$(readlink $(DESTDIR)$(libdir)/libudev.so) && \ so_img_rel_target_prefix=$$(echo $(libdir) | sed 's,\(^/\|\)[^/][^/]*,..,g') && \ - ln -sf $$so_img_rel_target_prefix$(rootlibdir)/$$so_img_name $(DESTDIR)$(libdir)/libudev.so && \ - mv $(DESTDIR)$(libdir)/libudev.so.* $(DESTDIR)$(rootlibdir); \ + ln -sf $$so_img_rel_target_prefix$(rootlib_execdir)/$$so_img_name $(DESTDIR)$(libdir)/libudev.so && \ + mv $(DESTDIR)$(libdir)/libudev.so.* $(DESTDIR)$(rootlib_execdir); \ fi uninstall-hook: - rm -f $(DESTDIR)$(rootlibdir)/libudev.so* + rm -f $(DESTDIR)$(rootlib_execdir)/libudev.so* |