X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=Makefile.in;h=abd60399552ad3508403ff9fa13907b993388a5d;hp=e698e8c9abf495f807eebef7a1dea2a8bcd6a215;hb=1e05ad915933124916c16e164cd2065646379cd7;hpb=bc0541635987ad8f35af9df6aacd5534d519ccb6

diff --git a/Makefile.in b/Makefile.in
index e698e8c..abd6039 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -67,6 +67,7 @@ DLLTOOL = @DLLTOOL@
 ILLLIB = @ILLLIB@
 ILLMODULE = @ILLMODULE@
 LD = @LD@
+LIBTHREAD = @LIBTHREAD@
 LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
 MAKEINFO = @MAKEINFO@
@@ -77,6 +78,7 @@ RANLIB = @RANLIB@
 READLINE_LIBS = @READLINE_LIBS@
 SUBDIRS_VAR = @SUBDIRS_VAR@
 VERSION = @VERSION@
+YAZ_SRC_ROOT = @YAZ_SRC_ROOT@
 
 AUTOMAKE_OPTIONS = foreign 
 
@@ -84,17 +86,21 @@ DIST_SUBDIRS = util odr z39.50 asn ill zutil comstack ccl tab retrieval server l
 
 SUBDIRS = @SUBDIRS_VAR@
 
-noinst_SCRIPTS = yaz-config
+aclocaldir = $(datadir)/aclocal
+
+aclocal_DATA = yaz.m4
+
 SPEC_FILE = $(PACKAGE).spec
-EXTRA_DIST = $(SPEC_FILE) README LICENSE CHANGELOG TODO windows.txt
+EXTRA_DIST = $(SPEC_FILE) README LICENSE CHANGELOG TODO windows.txt 	yaz-config.in yaz.m4
+
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_CLEAN_FILES = 
-SCRIPTS =  $(noinst_SCRIPTS)
+CONFIG_CLEAN_FILES =  yaz-config
+DATA =  $(aclocal_DATA)
 
 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)
@@ -117,6 +123,27 @@ config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	$(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
+
+install-aclocalDATA: $(aclocal_DATA)
+	@$(NORMAL_INSTALL)
+	$(mkinstalldirs) $(DESTDIR)$(aclocaldir)
+	@list='$(aclocal_DATA)'; for p in $$list; do \
+	  if test -f $(srcdir)/$$p; then \
+	    echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(aclocaldir)/$$p"; \
+	    $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(aclocaldir)/$$p; \
+	  else if test -f $$p; then \
+	    echo " $(INSTALL_DATA) $$p $(DESTDIR)$(aclocaldir)/$$p"; \
+	    $(INSTALL_DATA) $$p $(DESTDIR)$(aclocaldir)/$$p; \
+	  fi; fi; \
+	done
+
+uninstall-aclocalDATA:
+	@$(NORMAL_UNINSTALL)
+	list='$(aclocal_DATA)'; for p in $$list; do \
+	  rm -f $(DESTDIR)$(aclocaldir)/$$p; \
+	done
 
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
@@ -282,20 +309,21 @@ installcheck: installcheck-recursive
 install-exec-am:
 install-exec: install-exec-recursive
 
-install-data-am:
+install-data-am: install-aclocalDATA
 install-data: install-data-recursive
 
 install-am: all-am
 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
 install: install-recursive
-uninstall-am:
+uninstall-am: uninstall-aclocalDATA
 uninstall: uninstall-recursive
-all-am: Makefile $(SCRIPTS)
+all-am: Makefile $(DATA)
 all-redirect: all-recursive
 install-strip:
 	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
 installdirs: installdirs-recursive
 installdirs-am:
+	$(mkinstalldirs)  $(DESTDIR)$(aclocaldir)
 
 
 mostlyclean-generic:
@@ -329,11 +357,11 @@ maintainer-clean-am:  maintainer-clean-tags maintainer-clean-generic \
 maintainer-clean: maintainer-clean-recursive
 	-rm -f config.status
 
-.PHONY: install-data-recursive uninstall-data-recursive \
-install-exec-recursive uninstall-exec-recursive installdirs-recursive \
-uninstalldirs-recursive all-recursive check-recursive \
-installcheck-recursive info-recursive dvi-recursive \
-mostlyclean-recursive distclean-recursive clean-recursive \
+.PHONY: uninstall-aclocalDATA install-aclocalDATA install-data-recursive \
+uninstall-data-recursive install-exec-recursive \
+uninstall-exec-recursive installdirs-recursive uninstalldirs-recursive \
+all-recursive check-recursive installcheck-recursive info-recursive \
+dvi-recursive mostlyclean-recursive distclean-recursive clean-recursive \
 maintainer-clean-recursive tags tags-recursive mostlyclean-tags \
 distclean-tags clean-tags maintainer-clean-tags distdir info-am info \
 dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
@@ -343,15 +371,6 @@ installdirs mostlyclean-generic distclean-generic clean-generic \
 maintainer-clean-generic clean mostlyclean distclean maintainer-clean
 
 
-yaz-config: Makefile
-	@echo "#!/bin/sh" >yaz-config
-	@echo "# YAZ settings for developers" >>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