From c142c16fa40ec4e762782a9c7e807e37baca3f7f Mon Sep 17 00:00:00 2001 From: Thomas Schmitt Date: Tue, 8 Jul 2008 09:27:05 +0000 Subject: [PATCH] Installing softlinks xorrisofs and osirrox pointing to the xorriso binary --- libisoburn/trunk/Makefile.am | 19 +++++++++++-------- libisoburn/trunk/README | 4 ++++ libisoburn/trunk/xorriso/README | 4 ++++ .../trunk/xorriso/xorriso_makefile_am.txt | 8 ++++++++ libisoburn/trunk/xorriso/xorriso_timestamp.h | 2 +- 5 files changed, 28 insertions(+), 9 deletions(-) diff --git a/libisoburn/trunk/Makefile.am b/libisoburn/trunk/Makefile.am index e1b4711a..5e0d8e42 100644 --- a/libisoburn/trunk/Makefile.am +++ b/libisoburn/trunk/Makefile.am @@ -16,9 +16,11 @@ libisoburn_libisoburn_la_SOURCES = \ libisoburn/isofs_wrap.c \ libisoburn/libisoburn.h \ version.h + libisoburn_libisoburn_la_LIBADD = \ -lisofs \ - -lburn + -lburn + libinclude_HEADERS = \ libisoburn/libisoburn.h @@ -42,6 +44,14 @@ xorriso_xorriso_SOURCES = \ xorriso/xorriso_timestamp.h +# Install symbolic links to the xorriso binary +# +install-exec-hook: + if test -e $(bindir)/xorrisofs ; then rm $(bindir)/xorrisofs ; else echo ; fi + ln -s xorriso $(bindir)/xorrisofs + if test -e $(bindir)/osirrox ; then rm $(bindir)/osirrox ; else echo ; fi + ln -s xorriso $(bindir)/osirrox + ## Build test applications noinst_PROGRAMS = \ test/compare_file @@ -55,13 +65,6 @@ test_compare_file_CFLAGS = test_compare_file_LDADD = test_compare_file_SOURCES = test/compare_file.c -# ts A80110 - A80210 : we need as minimal demo something better than test.c -# test/test - -# test_test_CPPFLAGS = -Ilibisofs -Ilibburn -Ilibisoburn -# test_test_LDADD = $(libisoburn_libisoburn_la_OBJECTS) $(THREAD_LIBS) -lburn -lisofs -# test_test_SOURCES = test/test.c - ## ========================================================================= ## diff --git a/libisoburn/trunk/README b/libisoburn/trunk/README index 36966c57..ae0c635b 100644 --- a/libisoburn/trunk/README +++ b/libisoburn/trunk/README @@ -67,6 +67,10 @@ xorriso binary depending on libburn.so, libisofs.so, libisoburn.so. After installation documentation is available via man xorriso +Two alias links point to the xorriso binary: + xorrisofs starts xorriso with -as mkisofs emulation already enabled + osirrox starts with -osirrox image-to-disk copying already enabled + Drives and Disk File Objects diff --git a/libisoburn/trunk/xorriso/README b/libisoburn/trunk/xorriso/README index d721fbcc..157f6129 100644 --- a/libisoburn/trunk/xorriso/README +++ b/libisoburn/trunk/xorriso/README @@ -69,6 +69,10 @@ It gets installed with "make install" but may also be placed manually in the ./man1 directory below one of the directories mentioned in environment variable $MANPATH. +The installation creates two alias links pointing to the xorriso binary: + xorrisofs starts xorriso with -as mkisofs emulation already enabled + osirrox starts with -osirrox image-to-disk copying already enabled + Drives and Disk File Objects diff --git a/libisoburn/trunk/xorriso/xorriso_makefile_am.txt b/libisoburn/trunk/xorriso/xorriso_makefile_am.txt index 6cdb689b..7bc3c880 100644 --- a/libisoburn/trunk/xorriso/xorriso_makefile_am.txt +++ b/libisoburn/trunk/xorriso/xorriso_makefile_am.txt @@ -151,6 +151,14 @@ test_compare_file_LDADD = test_compare_file_SOURCES = test/compare_file.c +# Install symbolic links to the xorriso binary +# +install-exec-hook: + if test -e $(bindir)/xorrisofs ; then rm $(bindir)/xorrisofs ; else echo ; fi + ln -s xorriso $(bindir)/xorrisofs + if test -e $(bindir)/osirrox ; then rm $(bindir)/osirrox ; else echo ; fi + ln -s xorriso $(bindir)/osirrox + ## ========================================================================= ## # Indent source files diff --git a/libisoburn/trunk/xorriso/xorriso_timestamp.h b/libisoburn/trunk/xorriso/xorriso_timestamp.h index 1cb18702..4aa91a1a 100644 --- a/libisoburn/trunk/xorriso/xorriso_timestamp.h +++ b/libisoburn/trunk/xorriso/xorriso_timestamp.h @@ -1 +1 @@ -#define Xorriso_timestamP "2008.07.07.150337" +#define Xorriso_timestamP "2008.07.08.092732"