libburnia/legacy
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

On Linux: More tolerance towards failures of ldconfig

Browse Source
This commit is contained in:
Thomas Schmitt 2010-09-21 15:03:56 +00:00
parent 38e52468ca
commit 36dbd149da
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libisoburn/trunk/Makefile.am
View File

@ -129,7 +129,7 @@ install-exec-hook:
ln -s xorriso "$(DESTDIR)$(bindir)"/osirrox ln -s xorriso "$(DESTDIR)$(bindir)"/osirrox
if test -e "$(DESTDIR)$(bindir)"/xorrecord ; then rm "$(DESTDIR)$(bindir)"/xorrecord ; else echo ; fi if test -e "$(DESTDIR)$(bindir)"/xorrecord ; then rm "$(DESTDIR)$(bindir)"/xorrecord ; else echo ; fi
ln -s xorriso "$(DESTDIR)$(bindir)"/xorrecord 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. # Alternative to the disabled .PHONY above.

2
libisoburn/trunk/acinclude.m4
View File

@ -18,7 +18,7 @@ AC_DEFUN([TARGET_SHIZZLE],
AC_MSG_CHECKING([target operating system]) 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 case $target in
*-*-linux*) *-*-linux*)
ARCH=linux ARCH=linux

2
libisoburn/trunk/configure.ac
View File

@ -277,7 +277,7 @@ AC_ARG_ENABLE(ldconfig-at-install,
if test x$ldconfig_at_install = xyes; then if test x$ldconfig_at_install = xyes; then
dummy=dummy dummy=dummy
else 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" echo "disabled run of ldconfig during installation on GNU/Linux"
fi fi
AC_SUBST(LIBBURNIA_LDCONFIG_CMD) AC_SUBST(LIBBURNIA_LDCONFIG_CMD)

2
libisoburn/trunk/xorriso/xorriso_timestamp.h
View File

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