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

14 years ago · 33aec8f935
parent 5da590372c
commit 33aec8f935
4 changed files with 9 additions and 2 deletions
--- 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)/libisoburn

 lib_LTLIBRARIES = libisoburn/libisoburn.la 
--- 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=
--- a/configure.ac
+++ b/configure.ac
@ -88,6 +88,7 @@ AC_SUBST(THREAD_LIBS)

 TARGET_SHIZZLE
 AC_SUBST(ARCH)
+AC_SUBST(LIBBURNIA_PKGCONFDIR)
 AC_SUBST(LIBBURN_ARCH_LIBS)


--- a/xorriso/xorriso_timestamp.h
+++ b/xorriso/xorriso_timestamp.h
@ -1 +1 @@
-#define Xorriso_timestamP "2009.03.16.112837"
+#define Xorriso_timestamP "2009.03.18.103858"