-## $Id: Makefile.am,v 1.8 2000-06-19 09:49:35 adam Exp $
+## $Id: Makefile.am,v 1.9 2000-10-02 12:31:43 adam Exp $
AUTOMAKE_OPTIONS = foreign
SUBDIRS = @SUBDIRS_VAR@
-noinst_SCRIPTS = yaz-config
SPEC_FILE=$(PACKAGE).spec
EXTRA_DIST=$(SPEC_FILE) README LICENSE CHANGELOG TODO windows.txt
-yaz-config: Makefile
- @rm -f yaz-config
- @echo "#!/bin/sh" >yaz-config
- @echo "# yaz-config for source tree" >>yaz-config
- @echo "YAZVERSION=@VERSION@" >>yaz-config
- @echo "YAZBIN=\"`pwd`/bin\"" >>yaz-config
- @echo "YAZTAB=\"`pwd`/tab\"" >>yaz-config
- @echo "YAZLIB=\"-L`pwd`/lib/.libs -lyaz @LIBS@\"" >>yaz-config
- @echo "YAZINC=\"-I`pwd`/include\"" >>yaz-config
- chmod +x yaz-config
-
dist-hook:
cd doc; make
mkdir $(distdir)/win
READLINE_LIBS = @READLINE_LIBS@
SUBDIRS_VAR = @SUBDIRS_VAR@
VERSION = @VERSION@
+YAZ_SRC_ROOT = @YAZ_SRC_ROOT@
AUTOMAKE_OPTIONS = foreign
SUBDIRS = @SUBDIRS_VAR@
-noinst_SCRIPTS = yaz-config
SPEC_FILE = $(PACKAGE).spec
EXTRA_DIST = $(SPEC_FILE) README LICENSE CHANGELOG TODO windows.txt
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_CLEAN_FILES =
-SCRIPTS = $(noinst_SCRIPTS)
-
+CONFIG_CLEAN_FILES = yaz-config
DIST_COMMON = README Makefile.am Makefile.in TODO aclocal.m4 \
config.guess config.sub configure configure.in install-sh ltconfig \
-ltmain.sh missing mkinstalldirs
+ltmain.sh missing mkinstalldirs yaz-config.in
DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
$(SHELL) ./config.status --recheck
$(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
cd $(srcdir) && $(AUTOCONF)
+yaz-config: $(top_builddir)/config.status yaz-config.in
+ cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
# This directory's subdirectories are mostly independent; you can cd
# into them and run `make' without going through this Makefile.
install: install-recursive
uninstall-am:
uninstall: uninstall-recursive
-all-am: Makefile $(SCRIPTS)
+all-am: Makefile
all-redirect: all-recursive
install-strip:
$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
maintainer-clean-generic clean mostlyclean distclean maintainer-clean
-yaz-config: Makefile
- @rm -f yaz-config
- @echo "#!/bin/sh" >yaz-config
- @echo "# yaz-config for source tree" >>yaz-config
- @echo "YAZVERSION=@VERSION@" >>yaz-config
- @echo "YAZBIN=\"`pwd`/bin\"" >>yaz-config
- @echo "YAZTAB=\"`pwd`/tab\"" >>yaz-config
- @echo "YAZLIB=\"-L`pwd`/lib/.libs -lyaz @LIBS@\"" >>yaz-config
- @echo "YAZINC=\"-I`pwd`/include\"" >>yaz-config
- chmod +x yaz-config
-
dist-hook:
cd doc; make
mkdir $(distdir)/win
READLINE_LIBS = @READLINE_LIBS@
SUBDIRS_VAR = @SUBDIRS_VAR@
VERSION = @VERSION@
+YAZ_SRC_ROOT = @YAZ_SRC_ROOT@
noinst_LTLIBRARIES = libasn.la
READLINE_LIBS = @READLINE_LIBS@
SUBDIRS_VAR = @SUBDIRS_VAR@
VERSION = @VERSION@
+YAZ_SRC_ROOT = @YAZ_SRC_ROOT@
noinst_LTLIBRARIES = libccl.la
READLINE_LIBS = @READLINE_LIBS@
SUBDIRS_VAR = @SUBDIRS_VAR@
VERSION = @VERSION@
+YAZ_SRC_ROOT = @YAZ_SRC_ROOT@
bin_PROGRAMS = yaz-client
READLINE_LIBS = @READLINE_LIBS@
SUBDIRS_VAR = @SUBDIRS_VAR@
VERSION = @VERSION@
+YAZ_SRC_ROOT = @YAZ_SRC_ROOT@
noinst_LTLIBRARIES = libcomstack.la
echo "$ac_t""no" 1>&6
fi
fi
+
+YAZ_SRC_ROOT=`pwd`
SUBDIRS_VAR="util odr $ASNMODULE $ILLMODULE zutil comstack ccl tab retrieval server include lib client ztest"
trap '' 1 2 15
client/Makefile
ztest/Makefile
doc/Makefile
+yaz-config
lib/yaz-config" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
EOF
cat >> $CONFIG_STATUS <<EOF
s%@ASNMODULE@%$ASNMODULE%g
s%@ILLMODULE@%$ILLMODULE%g
s%@ILLLIB@%$ILLLIB%g
+s%@YAZ_SRC_ROOT@%$YAZ_SRC_ROOT%g
s%@SUBDIRS_VAR@%$SUBDIRS_VAR%g
CEOF
client/Makefile
ztest/Makefile
doc/Makefile
+yaz-config
lib/yaz-config"}
EOF
cat >> $CONFIG_STATUS <<\EOF
EOF
cat >> $CONFIG_STATUS <<\EOF
-chmod +x lib/yaz-config
+chmod +x lib/yaz-config yaz-config
exit 0
EOF
chmod +x $CONFIG_STATUS
dnl YAZ Toolkit, Index Data 1994-2000
dnl See the file LICENSE for details.
-dnl $Id: configure.in,v 1.32 2000-09-14 12:05:08 adam Exp $
+dnl $Id: configure.in,v 1.33 2000-10-02 12:31:43 adam Exp $
AC_INIT(include/yaz/yaz-version.h)
AM_INIT_AUTOMAKE(yaz, 1.7)
dnl
AC_MSG_RESULT(no)
fi
fi
+dnl ------ Using this for "in-source" yaz-config
+AC_SUBST(YAZ_SRC_ROOT)
+YAZ_SRC_ROOT=`pwd`
dnl
SUBDIRS_VAR="util odr $ASNMODULE $ILLMODULE zutil comstack ccl tab retrieval server include lib client ztest"
AC_SUBST(SUBDIRS_VAR)
client/Makefile
ztest/Makefile
doc/Makefile
-lib/yaz-config],[chmod +x lib/yaz-config])
+yaz-config
+lib/yaz-config],[chmod +x lib/yaz-config yaz-config])
READLINE_LIBS = @READLINE_LIBS@
SUBDIRS_VAR = @SUBDIRS_VAR@
VERSION = @VERSION@
+YAZ_SRC_ROOT = @YAZ_SRC_ROOT@
docdir = $(pkgdatadir)/doc
READLINE_LIBS = @READLINE_LIBS@
SUBDIRS_VAR = @SUBDIRS_VAR@
VERSION = @VERSION@
+YAZ_SRC_ROOT = @YAZ_SRC_ROOT@
INCLUDES = -I$(srcdir)/../include
READLINE_LIBS = @READLINE_LIBS@
SUBDIRS_VAR = @SUBDIRS_VAR@
VERSION = @VERSION@
+YAZ_SRC_ROOT = @YAZ_SRC_ROOT@
AUTOMAKE_OPTIONS = foreign
READLINE_LIBS = @READLINE_LIBS@
SUBDIRS_VAR = @SUBDIRS_VAR@
VERSION = @VERSION@
+YAZ_SRC_ROOT = @YAZ_SRC_ROOT@
pkginclude_HEADERS = backend.h ccl.h comstack.h d1_attset.h d1_map.h data1.h diagbib1.h log.h logrpn.h marcdisp.h nmem.h odr.h oid.h options.h otherinfo.h pquery.h prt-ext.h readconf.h statserv.h tcpip.h tpath.h wrbuf.h xmalloc.h yaz-ccl.h yaz-util.h yaz-version.h yconfig.h proto.h ill.h ill-core.h item-req.h z-accdes1.h z-accform1.h z-acckrb1.h z-core.h z-date.h z-diag1.h z-espec1.h z-estask.h z-exp.h z-grs.h z-opac.h z-proto.h z-rrf1.h z-rrf2.h z-sum.h z-sutrs.h z-uifr1.h z-univ.h zes-expi.h zes-exps.h zes-order.h zes-pquery.h zes-psched.h zes-admin.h zes-pset.h zes-update.h zes-update0.h prt-acc.h prt-add.h prt-arc.h prt-dat.h prt-dia.h prt-esp.h prt-exd.h prt-exp.h prt-grs.h prt-proto.h prt-rsc.h prt-univ.h
READLINE_LIBS = @READLINE_LIBS@
SUBDIRS_VAR = @SUBDIRS_VAR@
VERSION = @VERSION@
+YAZ_SRC_ROOT = @YAZ_SRC_ROOT@
lib_LTLIBRARIES = libyaz.la
#!/bin/sh
-# $Id: yaz-config.in,v 1.5 2000-08-04 10:40:45 adam Exp $
+# $Id: yaz-config.in,v 1.6 2000-10-02 12:31:43 adam Exp $
yazprefix=@prefix@
-echo_cflags=no
-echo_libs=no
-echo_help=no
-echo_tabs=no
+yaz_echo_cflags=no
+yaz_echo_libs=no
+yaz_echo_help=no
+yaz_echo_tabs=no
yazlibs="@LIBS@"
YAZVERSION=@VERSION@
}
#if test $# -eq 0; then
-# echo_help=yes
+# yaz_echo_help=yes
#fi
while test $# -gt 0; do
exit 0
;;
--cflags)
- echo_cflags=yes
+ yaz_echo_cflags=yes
;;
--libs)
- echo_libs=yes
+ yaz_echo_libs=yes
;;
--tabs)
- echo_tabs=yes
+ yaz_echo_tabs=yes
;;
-*)
- echo_help=yes
+ yaz_echo_help=yes
;;
esac
shift
YAZINC=-I$yazprefix/include
fi
-if test "$echo_help" = "yes"; then
+if test "$yaz_echo_help" = "yes"; then
usage 1 1>&2
fi
-if test "$echo_cflags" = "yes"; then
+if test "$yaz_echo_cflags" = "yes"; then
echo $YAZINC
fi
-if test "$echo_libs" = "yes"; then
+if test "$yaz_echo_libs" = "yes"; then
echo $YAZLIB
fi
-if test "$echo_tabs" = "yes"; then
+if test "$yaz_echo_tabs" = "yes"; then
echo $YAZTAB
fi
READLINE_LIBS = @READLINE_LIBS@
SUBDIRS_VAR = @SUBDIRS_VAR@
VERSION = @VERSION@
+YAZ_SRC_ROOT = @YAZ_SRC_ROOT@
noinst_LTLIBRARIES = libodr.la
READLINE_LIBS = @READLINE_LIBS@
SUBDIRS_VAR = @SUBDIRS_VAR@
VERSION = @VERSION@
+YAZ_SRC_ROOT = @YAZ_SRC_ROOT@
noinst_LTLIBRARIES = libret.la
READLINE_LIBS = @READLINE_LIBS@
SUBDIRS_VAR = @SUBDIRS_VAR@
VERSION = @VERSION@
+YAZ_SRC_ROOT = @YAZ_SRC_ROOT@
noinst_LTLIBRARIES = libserver.la
READLINE_LIBS = @READLINE_LIBS@
SUBDIRS_VAR = @SUBDIRS_VAR@
VERSION = @VERSION@
+YAZ_SRC_ROOT = @YAZ_SRC_ROOT@
tabdatadir = $(pkgdatadir)/tab
tabdata_DATA = bib1.att dan1.att danmarc.abs danmarc.mar explain.abs explain.att explain.tag generic.tag gils-a.est gils-b.est gils-f.est gils-g.est gils-summary.map gils-usmarc.map gils-variant.est gils.abs gils.att gils.tag meta-b.est meta-usmarc.map meta.abs meta.tag summary.abs summary.tag tagsetg.tag tagsetm.tag usmarc-b.est usmarc.abs usmarc.mar usmarc.tag var1.var wais-b.est wais-variant.est wais.abs
READLINE_LIBS = @READLINE_LIBS@
SUBDIRS_VAR = @SUBDIRS_VAR@
VERSION = @VERSION@
+YAZ_SRC_ROOT = @YAZ_SRC_ROOT@
noinst_LTLIBRARIES = libutil.la
--- /dev/null
+#!/bin/sh
+# yaz-config for source tree
+YAZVERSION=@VERSION@
+YAZBIN="@YAZ_SRC_ROOT@/bin"
+YAZTAB="@YAZ_SRC_ROOT@/tab"
+YAZLIB="-L@YAZ_SRC_ROOT@/lib/.libs -lyaz"
+YAZINC="-I@YAZ_SRC_ROOT@/include"
READLINE_LIBS = @READLINE_LIBS@
SUBDIRS_VAR = @SUBDIRS_VAR@
VERSION = @VERSION@
+YAZ_SRC_ROOT = @YAZ_SRC_ROOT@
INCLUDES = -I$(srcdir)/../include
READLINE_LIBS = @READLINE_LIBS@
SUBDIRS_VAR = @SUBDIRS_VAR@
VERSION = @VERSION@
+YAZ_SRC_ROOT = @YAZ_SRC_ROOT@
bin_PROGRAMS = yaz-ztest
READLINE_LIBS = @READLINE_LIBS@
SUBDIRS_VAR = @SUBDIRS_VAR@
VERSION = @VERSION@
+YAZ_SRC_ROOT = @YAZ_SRC_ROOT@
noinst_LTLIBRARIES = libzutil.la