Browse Source

On Linux: More tolerance towards failures of ldconfig

master
Thomas Schmitt 12 years ago
parent
commit
41d0d1c03f
  1. 2
      Makefile.am
  2. 2
      acinclude.m4
  3. 2
      configure.ac
  4. 2
      xorriso/xorriso_timestamp.h

2
Makefile.am

@ -129,7 +129,7 @@ install-exec-hook:
ln -s xorriso "$(DESTDIR)$(bindir)"/osirrox
if test -e "$(DESTDIR)$(bindir)"/xorrecord ; then rm "$(DESTDIR)$(bindir)"/xorrecord ; else echo ; fi
ln -s xorriso "$(DESTDIR)$(bindir)"/xorrecord
$(LIBBURNIA_LDCONFIG_CMD) "$(DESTDIR)$(libdir)"
$(LIBBURNIA_LDCONFIG_CMD) "$(DESTDIR)$(libdir)" || echo 'NOTE: Explicite dynamic library configuration failed. If needed, configure manually for:' "$(DESTDIR)$(libdir)"
# Alternative to the disabled .PHONY above.

2
acinclude.m4

@ -18,7 +18,7 @@ AC_DEFUN([TARGET_SHIZZLE],
AC_MSG_CHECKING([target operating system])
LIBBURNIA_LDCONFIG_CMD="echo 'NOTE: No explicit dynamic library configuration done. E.g. on GNU/Linux: ldconfig'"
LIBBURNIA_LDCONFIG_CMD="echo 'No ldconfig run performed. If needed, configure manually for:'"
case $target in
*-*-linux*)
ARCH=linux

2
configure.ac

@ -277,7 +277,7 @@ AC_ARG_ENABLE(ldconfig-at-install,
if test x$ldconfig_at_install = xyes; then
dummy=dummy
else
LIBBURNIA_LDCONFIG_CMD="echo 'NOTE: Explicit dynamic library configuration is disabled. E.g. on GNU/Linux: ldconfig'"
LIBBURNIA_LDCONFIG_CMD="echo 'NOTE: ldconfig is disabled. If needed, configure manually for:'"
echo "disabled run of ldconfig during installation on GNU/Linux"
fi
AC_SUBST(LIBBURNIA_LDCONFIG_CMD)

2
xorriso/xorriso_timestamp.h

@ -1 +1 @@
#define Xorriso_timestamP "2010.09.21.142424"
#define Xorriso_timestamP "2010.09.21.150325"

Loading…
Cancel
Save