Get on FreeBSD pkgconfigdir=.../libdata , on Linux and others: .../lib

ZeroSixSix
Thomas Schmitt 14 years ago
parent d19abc1940
commit 4626304e39
  1. 6
      Makefile.am
  2. 3
      acinclude.m4
  3. 2
      cdrskin/cdrskin_timestamp.h
  4. 1
      configure.ac

@ -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

@ -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=

@ -1 +1 @@
#define Cdrskin_timestamP "2009.03.13.135818"
#define Cdrskin_timestamP "2009.03.16.190745"

@ -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

Loading…
Cancel
Save