From dc67d11a63253c23b6fe200a1e8a6a471651ab06 Mon Sep 17 00:00:00 2001 From: Thomas Schmitt Date: Wed, 18 Mar 2009 10:39:35 +0000 Subject: [PATCH] Get on FreeBSD pkgconfigdir=.../libdata , on Linux and others: .../lib --- libisoburn/trunk/Makefile.am | 6 +++++- libisoburn/trunk/acinclude.m4 | 2 ++ libisoburn/trunk/configure.ac | 1 + libisoburn/trunk/xorriso/xorriso_timestamp.h | 2 +- 4 files changed, 9 insertions(+), 2 deletions(-) diff --git a/libisoburn/trunk/Makefile.am b/libisoburn/trunk/Makefile.am index 558c01b4..96294437 100644 --- a/libisoburn/trunk/Makefile.am +++ b/libisoburn/trunk/Makefile.am @@ -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=$(includedir)/libisoburn lib_LTLIBRARIES = libisoburn/libisoburn.la diff --git a/libisoburn/trunk/acinclude.m4 b/libisoburn/trunk/acinclude.m4 index a6d65dd0..02577cb1 100644 --- a/libisoburn/trunk/acinclude.m4 +++ b/libisoburn/trunk/acinclude.m4 @@ -1,6 +1,7 @@ AC_DEFUN([TARGET_SHIZZLE], [ ARCH="" + LIBBURNIA_PKGCONFDIR="$libdir"/pkgconfig AC_MSG_CHECKING([target operating system]) @@ -12,6 +13,7 @@ AC_DEFUN([TARGET_SHIZZLE], *-*-freebsd*) ARCH=freebsd LIBBURN_ARCH_LIBS=-lcam + LIBBURNIA_PKGCONFDIR=$(echo "$libdir" | sed 's/\/lib$/\/libdata/')/pkgconfig ;; *) ARCH= diff --git a/libisoburn/trunk/configure.ac b/libisoburn/trunk/configure.ac index 12f0e1b7..f99af5a5 100644 --- a/libisoburn/trunk/configure.ac +++ b/libisoburn/trunk/configure.ac @@ -88,6 +88,7 @@ AC_SUBST(THREAD_LIBS) TARGET_SHIZZLE AC_SUBST(ARCH) +AC_SUBST(LIBBURNIA_PKGCONFDIR) AC_SUBST(LIBBURN_ARCH_LIBS) diff --git a/libisoburn/trunk/xorriso/xorriso_timestamp.h b/libisoburn/trunk/xorriso/xorriso_timestamp.h index 8df9cbd9..a77abd16 100644 --- a/libisoburn/trunk/xorriso/xorriso_timestamp.h +++ b/libisoburn/trunk/xorriso/xorriso_timestamp.h @@ -1 +1 @@ -#define Xorriso_timestamP "2009.03.16.112837" +#define Xorriso_timestamP "2009.03.18.103858"