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

master
Thomas Schmitt 14 years ago
parent 5da590372c
commit 33aec8f935
  1. 6
      Makefile.am
  2. 2
      acinclude.m4
  3. 1
      configure.ac
  4. 2
      xorriso/xorriso_timestamp.h

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

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

@ -88,6 +88,7 @@ AC_SUBST(THREAD_LIBS)
TARGET_SHIZZLE
AC_SUBST(ARCH)
AC_SUBST(LIBBURNIA_PKGCONFDIR)
AC_SUBST(LIBBURN_ARCH_LIBS)

@ -1 +1 @@
#define Xorriso_timestamP "2009.03.16.112837"
#define Xorriso_timestamP "2009.03.18.103858"

Loading…
Cancel
Save