From cd427b269abdbcd0d14cedd558ba3ba5f48d004c Mon Sep 17 00:00:00 2001 From: Thomas Schmitt Date: Tue, 17 Mar 2009 21:33:20 +0100 Subject: [PATCH] Get on FreeBSD pkgconfigdir=.../libdata , on Linux and others: .../lib --- Makefile.am | 6 +++++- acinclude.m4 | 2 ++ configure.ac | 1 + 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index a8816e6..de694a9 100644 --- a/Makefile.am +++ b/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)/libisofs lib_LTLIBRARIES = libisofs/libisofs.la diff --git a/acinclude.m4 b/acinclude.m4 index a6d65dd..02577cb 100644 --- a/acinclude.m4 +++ b/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/configure.ac b/configure.ac index 9264410..750a012 100644 --- a/configure.ac +++ b/configure.ac @@ -124,6 +124,7 @@ AC_SUBST(THREAD_LIBS) TARGET_SHIZZLE AC_SUBST(ARCH) +AC_SUBST(LIBBURNIA_PKGCONFDIR) AC_SUBST(LIBBURN_ARCH_LIBS) dnl Add compiler-specific flags