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

[idzebra-moved-to-github.git] / recctrl / Makefile.am

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) \