Store Zebra libs in <prefix>/lib/idzebra<suffix> and modules in

<prefix>/lib/idzebra<suffix>/modules .

diff --git a/bfile/Makefile.am b/bfile/Makefile.am
index e816a89..16908e7 100644 (file)
--- a/bfile/Makefile.am
+++ b/bfile/Makefile.am
@@ -1,5 +1,8 @@
-## $Id: Makefile.am,v 1.6 2006-06-26 15:11:21 marc Exp $ Copyright (C) 1994-1998, Index Data ApS
-lib_LTLIBRARIES = libidzebra-bfile.la
+## $Id: Makefile.am,v 1.7 2006-06-29 09:10:29 adam Exp $ 
+
+zebralibdir=$(libdir)/$(PACKAGE)$(PACKAGE_SUFFIX)
+
+zebralib_LTLIBRARIES = libidzebra-bfile.la
 
 check_PROGRAMS = tstbfile1
 

diff --git a/data1/Makefile.am b/data1/Makefile.am
index cade864..81410e5 100644 (file)
--- a/data1/Makefile.am
+++ b/data1/Makefile.am
@@ -1,6 +1,8 @@
-## $Id: Makefile.am,v 1.3 2006-06-26 15:11:22 marc Exp $
+## $Id: Makefile.am,v 1.4 2006-06-29 09:10:33 adam Exp $
 
-lib_LTLIBRARIES=libidzebra-data1.la
+zebralibdir=$(libdir)/$(PACKAGE)$(PACKAGE_SUFFIX)
+
+zebralib_LTLIBRARIES=libidzebra-data1.la
 
 libidzebra_data1_la_LDFLAGS=-version-info $(ZEBRALIBS_VERSION)
 libidzebra_data1_la_SOURCES = d1_handle.c d1_read.c d1_attset.c d1_tagset.c \

diff --git a/dfa/Makefile.am b/dfa/Makefile.am
index d0c6ca5..17828c3 100644 (file)
--- a/dfa/Makefile.am
+++ b/dfa/Makefile.am
@@ -1,6 +1,8 @@
-## $Id: Makefile.am,v 1.7 2006-06-26 15:11:26 marc Exp $
+## $Id: Makefile.am,v 1.8 2006-06-29 09:10:34 adam Exp $
 
-lib_LTLIBRARIES = libidzebra-dfa.la
+zebralibdir=$(libdir)/$(PACKAGE)$(PACKAGE_SUFFIX)
+
+zebralib_LTLIBRARIES = libidzebra-dfa.la
 
 noinst_PROGRAMS = agrep lexer grepper
 

diff --git a/dict/Makefile.am b/dict/Makefile.am
index ff38253..f77b47e 100644 (file)
--- a/dict/Makefile.am
+++ b/dict/Makefile.am
@@ -1,6 +1,8 @@
-## $Id: Makefile.am,v 1.13 2006-06-26 15:11:28 marc Exp $
+## $Id: Makefile.am,v 1.14 2006-06-29 09:10:35 adam Exp $
 
-lib_LTLIBRARIES = libidzebra-dict.la
+zebralibdir=$(libdir)/$(PACKAGE)$(PACKAGE_SUFFIX)
+
+zebralib_LTLIBRARIES = libidzebra-dict.la
 noinst_PROGRAMS = dicttest dictext
 check_PROGRAMS = scantest
 

diff --git a/idzebra-config.in b/idzebra-config.in
index 034b1f2..956fbbb 100755 (executable)
--- a/idzebra-config.in
+++ b/idzebra-config.in
@@ -1,19 +1,21 @@
 #!/bin/sh
-# $Id: idzebra-config.in,v 1.9 2006-06-28 21:55:10 adam Exp $
+# $Id: idzebra-config.in,v 1.10 2006-06-29 09:10:28 adam Exp $
+version=@VERSION@
 prefix=@prefix@
-idzebra_echo_cflags=no
-idzebra_echo_libs=no
-idzebra_echo_help=no
-idzebra_echo_tab=no
-idzebra_echo_source=yes
-idzebra_echo_lalibs=no
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+echo_cflags=no
+echo_libs=no
+echo_help=no
+echo_tab=no
+echo_source=yes
+echo_lalibs=no
 idzebra_src_root=@IDZEBRA_SRC_ROOT@
 idzebra_build_root=@IDZEBRA_BUILD_ROOT@
 package_suffix=@PACKAGE_SUFFIX@
 
 extralibs="@YAZLIB@ @TCL_LIB@ @EXPAT_LIBS@ @XSLT_LIBS@ @LIBS@ "
 extralalibs="@YAZLALIB@ @TCL_LIB@ @EXPAT_LIBS@ @XSLT_LIBS@ @LIBS@"
-IDZEBRAVERSION=@VERSION@
 
 usage()
 {
@@ -32,7 +34,7 @@ EOF
 }
 
 if test $# -eq 0; then
-    idzebra_echo_help=yes
+    echo_help=yes
 fi
 
 modules=""
@@ -45,32 +47,34 @@ while test $# -gt 0; do
     case $1 in
        --prefix=*)
            prefix=$optarg
+           exec_prefix=$prefix
+           libdir=${exec_prefix}/lib
            ;;
        --prefix)
            echo $prefix
            exit 0
            ;;
        --version)
-           echo $IDZEBRAVERSION
+           echo $version
            exit 0
            ;;
        --cflags)
-           idzebra_echo_cflags=yes
+           echo_cflags=yes
            ;;
        --libs)
-           idzebra_echo_libs=yes
+           echo_libs=yes
            ;;
        --tab)
-           idzebra_echo_tab=yes
+           echo_tab=yes
            ;;
        --modules)
-           idzebra_echo_modules=yes
+           echo_modules=yes
            ;;
        --lalibs)
-           idzebra_echo_lalibs=yes
+           echo_lalibs=yes
            ;;
        -*)
-           idzebra_echo_help=yes
+           echo_help=yes
            ;;
        *)
            modules="$modules $1"
@@ -92,7 +96,7 @@ for m in $modules; do
     if test "$m" = "api"; then
         d="index"
     fi
-    if test "$idzebra_echo_source" = "yes"; then
+    if test "$echo_source" = "yes"; then
        IDZEBRALIB="$IDZEBRALIB -L${idzebra_build_root}/$d/.libs -lidzebra-$m"
         IDZEBRALALIB="$IDZEBRALALIB ${idzebra_build_root}/$d/libidzebra-$m.la"
     else
@@ -100,38 +104,37 @@ for m in $modules; do
     fi
 done
 
-if test "$idzebra_echo_source" = "yes"; then
+if test "$echo_source" = "yes"; then
     IDZEBRALIB="$IDZEBRALIB $extralibs"
     IDZEBRALALIB="$IDZEBRALALIB $extralalibs"
     IDZEBRAINC="$IDZEBRAINC -I${idzebra_src_root}/include"
     IDZEBRATAB="${idzebra_src_root}/tab"
+    IDZEBRAMOD="${idzebra_src_root}/recctrl"
 else
-    if test "$prefix" != "/usr"; then
-       IDZEBRALIB="-L${prefix}/lib $IDZEBRALIB"
-    fi
-    IDZEBRALIB="$IDZEBRALIB $extralibs"
+    IDZEBRALIB="-L${libdir}/idzebra${package_suffix} $IDZEBRALIB $extralibs"
     IDZEBRALALIB="$IDZEBRALIB"
     IDZEBRAINC="$IDZEBRAINC -I${prefix}/include/idzebra${package_suffix}"
     IDZEBRATAB="@datarootdir@/idzebra${package_suffix}/tab"
+    IDZEBRAMOD="${libdir}/idzebra${package_suffix}/modules"
 fi
 
-if test "$idzebra_echo_help" = "yes"; then
+if test "$echo_help" = "yes"; then
     usage 1 1>&2
 fi
-if test "$idzebra_echo_cflags" = "yes"; then
+if test "$echo_cflags" = "yes"; then
     echo $IDZEBRAINC
 fi
-if test "$idzebra_echo_libs" = "yes"; then
+if test "$echo_libs" = "yes"; then
     echo $IDZEBRALIB
 fi
-if test "$idzebra_echo_lalibs" = "yes"; then
+if test "$echo_lalibs" = "yes"; then
     echo $IDZEBRALALIB
 fi
-if test "$idzebra_echo_tab" = "yes"; then
+if test "$echo_tab" = "yes"; then
     echo $IDZEBRATAB
 fi
-if test "$idzebra_echo_modules" = "yes"; then
-    echo "${prefix}/lib/idzebra"
+if test "$echo_modules" = "yes"; then
+    echo $IDZEBRAMOD
 fi
 # Local Variables:
 # mode:shell-script

diff --git a/index/Makefile.am b/index/Makefile.am
index bbb25b9..edaab35 100644 (file)
--- a/index/Makefile.am
+++ b/index/Makefile.am
@@ -1,9 +1,10 @@
-## $Id: Makefile.am,v 1.45 2006-06-28 21:45:06 adam Exp $
+## $Id: Makefile.am,v 1.46 2006-06-29 09:10:37 adam Exp $
 
+zebralibdir=$(libdir)/$(PACKAGE)$(PACKAGE_SUFFIX)
 
 noinst_PROGRAMS = apitest kdump zebrash
 
-lib_LTLIBRARIES = libidzebra-api.la
+zebralib_LTLIBRARIES = libidzebra-api.la
 
 libidzebra_api_la_LDFLAGS=-version-info $(ZEBRALIBS_VERSION)
 libidzebra_api_la_SOURCES = \

diff --git a/isamb/Makefile.am b/isamb/Makefile.am
index 2348c82..5871c30 100644 (file)
--- a/isamb/Makefile.am
+++ b/isamb/Makefile.am
@@ -1,6 +1,8 @@
-## $Id: Makefile.am,v 1.9 2006-06-26 15:11:34 marc Exp $
+## $Id: Makefile.am,v 1.10 2006-06-29 09:10:38 adam Exp $
 
-lib_LTLIBRARIES = libidzebra-isamb.la
+zebralibdir=$(libdir)/$(PACKAGE)$(PACKAGE_SUFFIX)
+
+zebralib_LTLIBRARIES = libidzebra-isamb.la
 
 check_PROGRAMS = tstisamb
 

diff --git a/isamc/Makefile.am b/isamc/Makefile.am
index 7633e5c..c77aad8 100644 (file)
--- a/isamc/Makefile.am
+++ b/isamc/Makefile.am
@@ -1,6 +1,8 @@
-## $Id: Makefile.am,v 1.8 2006-06-26 15:11:36 marc Exp $
+## $Id: Makefile.am,v 1.9 2006-06-29 09:10:40 adam Exp $
 
-lib_LTLIBRARIES = libidzebra-isamc.la
+zebralibdir=$(libdir)/$(PACKAGE)$(PACKAGE_SUFFIX)
+
+zebralib_LTLIBRARIES = libidzebra-isamc.la
 
 libidzebra_isamc_la_LDFLAGS=-version-info $(ZEBRALIBS_VERSION)
 libidzebra_isamc_la_SOURCES = isamc.c merge.c isamc-p.h

diff --git a/isams/Makefile.am b/isams/Makefile.am
index a736897..1713ccb 100644 (file)
--- a/isams/Makefile.am
+++ b/isams/Makefile.am
@@ -1,6 +1,8 @@
-## $Id: Makefile.am,v 1.4 2006-06-26 15:11:37 marc Exp $
+## $Id: Makefile.am,v 1.5 2006-06-29 09:10:41 adam Exp $
 
-lib_LTLIBRARIES = libidzebra-isams.la
+zebralibdir=$(libdir)/$(PACKAGE)$(PACKAGE_SUFFIX)
+
+zebralib_LTLIBRARIES = libidzebra-isams.la
 
 AM_CPPFLAGS = -I$(srcdir)/../include $(YAZINC)
 

diff --git a/recctrl/Makefile.am b/recctrl/Makefile.am
index 86bd953..042e41e 100644 (file)
--- a/recctrl/Makefile.am
+++ b/recctrl/Makefile.am
@@ -1,7 +1,9 @@
-## $Id: Makefile.am,v 1.24 2006-06-28 21:40:47 adam Exp $
+## $Id: Makefile.am,v 1.25 2006-06-29 09:10:42 adam Exp $
 
 zebralibdir=$(libdir)/$(PACKAGE)$(PACKAGE_SUFFIX)
 
+modlibdir=$(libdir)/$(PACKAGE)$(PACKAGE_SUFFIX)/modules
+
 common_libs = libidzebra-recctrl.la \
  ../data1/libidzebra-data1.la \
  ../dfa/libidzebra-dfa.la  \
@@ -10,31 +12,31 @@ common_libs = libidzebra-recctrl.la \
 
 # The shared modules 
 mod_grs_regx_la_SOURCES = regxread.c
-mod_grs_regx_la_LDFLAGS = -rpath $(zebralibdir) -module -avoid-version
+mod_grs_regx_la_LDFLAGS = -rpath $(modlibdir) -module -avoid-version
 mod_grs_regx_la_LADD = $(TCL_LIB)
 mod_grs_regx_la_LIBADD = $(common_libs) $(mod_grs_regx_la_LADD)
 
 mod_grs_xml_la_SOURCES = xmlread.c
-mod_grs_xml_la_LDFLAGS = -rpath $(zebralibdir) -module -avoid-version
+mod_grs_xml_la_LDFLAGS = -rpath $(modlibdir) -module -avoid-version
 mod_grs_xml_la_LADD = $(EXPAT_LIBS)
 mod_grs_xml_la_LIBADD = $(common_libs) $(mod_grs_xml_la_LADD)
 
 mod_grs_marc_la_SOURCES = marcread.c marcomp.c marcomp.h inline.c inline.h
-mod_grs_marc_la_LDFLAGS = -rpath $(zebralibdir) -module -avoid-version
+mod_grs_marc_la_LDFLAGS = -rpath $(modlibdir) -module -avoid-version
 mod_grs_marc_la_LADD =
 mod_grs_marc_la_LIBADD = $(common_libs) $(mod_grs_marc_la_LADD)
 
 mod_safari_la_SOURCES = safari.c
-mod_safari_la_LDFLAGS = -rpath $(zebralibdir) -module -avoid-version
+mod_safari_la_LDFLAGS = -rpath $(modlibdir) -module -avoid-version
 mod_safari_la_LADD =
 mod_safari_la_LIBADD = $(common_libs) $(mod_safari_la_LADD)
 
 mod_alvis_la_SOURCES = alvis.c
-mod_alvis_la_LDFLAGS = -rpath $(zebralibdir) -module -avoid-version
+mod_alvis_la_LDFLAGS = -rpath $(modlibdir) -module -avoid-version
 mod_alvis_la_LADD = $(XSLT_LIBS)
 mod_alvis_la_LIBADD = $(common_libs) $(mod_alvis_la_LADD)
 
-zebralib_LTLIBRARIES = $(SHARED_MODULE_LA) 
+modlib_LTLIBRARIES = $(SHARED_MODULE_LA) 
 EXTRA_LTLIBRARIES = \
        mod-grs-regx.la \
        mod-grs-xml.la \
@@ -43,7 +45,7 @@ EXTRA_LTLIBRARIES = \
        mod-alvis.la
 
 # The common library
-lib_LTLIBRARIES = libidzebra-recctrl.la
+zebralib_LTLIBRARIES = libidzebra-recctrl.la
 libidzebra_recctrl_la_SOURCES = recctrl.c recgrs.c sgmlread.c rectext.c 
 libidzebra_recctrl_la_LDFLAGS = -export-dynamic -version-info $(ZEBRALIBS_VERSION)
 libidzebra_recctrl_la_LIBADD = $(STATIC_MODULE_OBJ) \

diff --git a/rset/Makefile.am b/rset/Makefile.am
index 0b681ab..6fbdb7a 100644 (file)
--- a/rset/Makefile.am
+++ b/rset/Makefile.am
@@ -1,5 +1,8 @@
-## $Id: Makefile.am,v 1.14 2006-06-26 15:11:41 marc Exp $
-lib_LTLIBRARIES = libidzebra-rset.la
+## $Id: Makefile.am,v 1.15 2006-06-29 09:10:44 adam Exp $
+
+zebralibdir=$(libdir)/$(PACKAGE)$(PACKAGE_SUFFIX)
+
+zebralib_LTLIBRARIES = libidzebra-rset.la
 
 libidzebra_rset_la_LDFLAGS=-version-info $(ZEBRALIBS_VERSION)
 libidzebra_rset_la_SOURCES = rset.c rstemp.c rsnull.c rsbool.c rsbetween.c \

diff --git a/util/Makefile.am b/util/Makefile.am
index aa2b203..57e9811 100644 (file)
--- a/util/Makefile.am
+++ b/util/Makefile.am
@@ -1,6 +1,8 @@
-## $Id: Makefile.am,v 1.19 2006-06-26 15:11:43 marc Exp $
+## $Id: Makefile.am,v 1.20 2006-06-29 09:10:47 adam Exp $
 
-lib_LTLIBRARIES = libidzebra-util.la
+zebralibdir=$(libdir)/$(PACKAGE)$(PACKAGE_SUFFIX)
+
+zebralib_LTLIBRARIES = libidzebra-util.la
 
 noinst_PROGRAMS = passtest