X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=Makefile.in;h=30ac8ad13e1ff6b8aa1292e2f0aaec92eef3b939;hp=883a3f461f6b76f5a6eda20c6a06023a4c74da22;hb=7282236bf8f7f5ed9890f04c2b658397fd333e8b;hpb=4b05ad4607916d50257919cead06b54785c18e29

diff --git a/Makefile.in b/Makefile.in
index 883a3f4..30ac8ad 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -77,6 +77,7 @@ RANLIB = @RANLIB@
 READLINE_LIBS = @READLINE_LIBS@
 SUBDIRS_VAR = @SUBDIRS_VAR@
 VERSION = @VERSION@
+YAZ_SRC_ROOT = @YAZ_SRC_ROOT@
 
 AUTOMAKE_OPTIONS = foreign 
 
@@ -84,17 +85,14 @@ DIST_SUBDIRS = util odr z39.50 asn ill zutil comstack ccl tab retrieval server l
 
 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)
@@ -117,6 +115,8 @@ 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
 
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
@@ -290,7 +290,7 @@ install-am: all-am
 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
@@ -343,17 +343,6 @@ installdirs mostlyclean-generic distclean-generic clean-generic \
 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