From 90fba134197714259ee7417df54c4570e45d39a6 Mon Sep 17 00:00:00 2001 From: Thomas Schmitt Date: Wed, 18 Mar 2009 10:40:25 +0000 Subject: [PATCH] Adapted xorriso-standalone to version leap libisofs-0.6.17 and FreeBSD libdata --- xorriso/configure_ac.txt | 3 ++- xorriso/xorriso_makefile_am.txt | 6 +++++- xorriso/xorriso_timestamp.h | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/xorriso/configure_ac.txt b/xorriso/configure_ac.txt index 85dad04d..a3a03968 100644 --- a/xorriso/configure_ac.txt +++ b/xorriso/configure_ac.txt @@ -16,7 +16,7 @@ AC_SUBST(BURN_MICRO_VERSION) LIBISOFS_MAJOR_VERSION=0 LIBISOFS_MINOR_VERSION=6 -LIBISOFS_MICRO_VERSION=16 +LIBISOFS_MICRO_VERSION=17 AC_SUBST(LIBISOFS_MAJOR_VERSION) AC_SUBST(LIBISOFS_MINOR_VERSION) AC_SUBST(LIBISOFS_MICRO_VERSION) @@ -78,6 +78,7 @@ AC_SUBST(THREAD_LIBS) TARGET_SHIZZLE AC_SUBST(ARCH) +AC_SUBST(LIBBURNIA_PKGCONFDIR) AC_SUBST(LIBBURN_ARCH_LIBS) diff --git a/xorriso/xorriso_makefile_am.txt b/xorriso/xorriso_makefile_am.txt index aed4c375..9bf97ed7 100644 --- a/xorriso/xorriso_makefile_am.txt +++ b/xorriso/xorriso_makefile_am.txt @@ -1,4 +1,8 @@ -pkgconfigdir=$(libdir)/pkgconfig + +# ts A90315 : LIBBURNIA_PKGCONFDIR is defined OS specific in acinclude.m4 +# was: pkgconfigdir=$(libdir)/pkgconfig +pkgconfigdir=$(LIBBURNIA_PKGCONFDIR) + libincludedir= lib_LTLIBRARIES = diff --git a/xorriso/xorriso_timestamp.h b/xorriso/xorriso_timestamp.h index a77abd16..927839fa 100644 --- a/xorriso/xorriso_timestamp.h +++ b/xorriso/xorriso_timestamp.h @@ -1 +1 @@ -#define Xorriso_timestamP "2009.03.18.103858" +#define Xorriso_timestamP "2009.03.18.104037"