From 45716488789436b405e53db1369d16dfb44a0a00 Mon Sep 17 00:00:00 2001 From: Thomas Schmitt Date: Mon, 16 Mar 2009 19:07:45 +0000 Subject: [PATCH] Get on FreeBSD pkgconfigdir=.../libdata , on Linux and others: .../lib --- libburn/trunk/Makefile.am | 6 +++++- libburn/trunk/acinclude.m4 | 3 +++ libburn/trunk/cdrskin/cdrskin_timestamp.h | 2 +- libburn/trunk/configure.ac | 1 + 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/libburn/trunk/Makefile.am b/libburn/trunk/Makefile.am index 833f66af..a541f142 100644 --- a/libburn/trunk/Makefile.am +++ b/libburn/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)/libburn lib_LTLIBRARIES = libburn/libburn.la diff --git a/libburn/trunk/acinclude.m4 b/libburn/trunk/acinclude.m4 index a6d65dd0..f0d8623a 100644 --- a/libburn/trunk/acinclude.m4 +++ b/libburn/trunk/acinclude.m4 @@ -1,9 +1,11 @@ AC_DEFUN([TARGET_SHIZZLE], [ ARCH="" + LIBBURNIA_PKGCONFDIR="$libdir"/pkgconfig AC_MSG_CHECKING([target operating system]) + case $target in *-*-linux*) ARCH=linux @@ -12,6 +14,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/libburn/trunk/cdrskin/cdrskin_timestamp.h b/libburn/trunk/cdrskin/cdrskin_timestamp.h index 49089949..bbc7bdff 100644 --- a/libburn/trunk/cdrskin/cdrskin_timestamp.h +++ b/libburn/trunk/cdrskin/cdrskin_timestamp.h @@ -1 +1 @@ -#define Cdrskin_timestamP "2009.03.13.135818" +#define Cdrskin_timestamP "2009.03.16.190745" diff --git a/libburn/trunk/configure.ac b/libburn/trunk/configure.ac index cc7c945e..82284011 100644 --- a/libburn/trunk/configure.ac +++ b/libburn/trunk/configure.ac @@ -162,6 +162,7 @@ AC_SUBST(THREAD_LIBS) TARGET_SHIZZLE AC_SUBST(ARCH) +AC_SUBST(LIBBURNIA_PKGCONFDIR) AC_SUBST(LIBBURN_ARCH_LIBS) dnl ts A90303