projects
/
yaz-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Modified yaz-config so that it only reports usage when bad options
[yaz-moved-to-github.git]
/
Makefile.in
diff --git
a/Makefile.in
b/Makefile.in
index
d11864d
..
883a3f4
100644
(file)
--- a/
Makefile.in
+++ b/
Makefile.in
@@
-10,10
+10,6
@@
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
# PARTICULAR PURPOSE.
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
# PARTICULAR PURPOSE.
-# Copyright (C) 1995-2000, Index Data
-# All rights reserved.
-# $Id: Makefile.in,v 1.15 2000-02-28 11:20:05 adam Exp $
-
SHELL = @SHELL@
SHELL = @SHELL@
@@
-61,14
+57,24
@@
POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
+host_alias = @host_alias@
+host_triplet = @host@
+AS = @AS@
ASNMODULE = @ASNMODULE@
CC = @CC@
CPP = @CPP@
ASNMODULE = @ASNMODULE@
CC = @CC@
CPP = @CPP@
+DLLTOOL = @DLLTOOL@
ILLLIB = @ILLLIB@
ILLMODULE = @ILLMODULE@
ILLLIB = @ILLLIB@
ILLMODULE = @ILLMODULE@
+LD = @LD@
+LIBTOOL = @LIBTOOL@
+LN_S = @LN_S@
MAKEINFO = @MAKEINFO@
MAKEINFO = @MAKEINFO@
+NM = @NM@
+OBJDUMP = @OBJDUMP@
PACKAGE = @PACKAGE@
RANLIB = @RANLIB@
PACKAGE = @PACKAGE@
RANLIB = @RANLIB@
+READLINE_LIBS = @READLINE_LIBS@
SUBDIRS_VAR = @SUBDIRS_VAR@
VERSION = @VERSION@
SUBDIRS_VAR = @SUBDIRS_VAR@
VERSION = @VERSION@
@@
-81,21
+87,14
@@
SUBDIRS = @SUBDIRS_VAR@
noinst_SCRIPTS = yaz-config
SPEC_FILE = $(PACKAGE).spec
EXTRA_DIST = $(SPEC_FILE) README LICENSE CHANGELOG TODO windows.txt
noinst_SCRIPTS = yaz-config
SPEC_FILE = $(PACKAGE).spec
EXTRA_DIST = $(SPEC_FILE) README LICENSE CHANGELOG TODO windows.txt
-
-BINDIR = $(exec_prefix)/bin
-# Public libraries and header files
-LIBDIR = $(exec_prefix)/lib
-INCDIR = $(prefix)/include
-# Misc tables, etc.
-YAZTAB = $(pkgdatadir)/tab
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = ./include/yaz/config.h
CONFIG_CLEAN_FILES =
SCRIPTS = $(noinst_SCRIPTS)
CONFIG_CLEAN_FILES =
SCRIPTS = $(noinst_SCRIPTS)
-DIST_COMMON = README Makefile.am Makefile.in TODO aclocal.m4 configure \
-configure.in install-sh missing mkinstalldirs
+DIST_COMMON = README Makefile.am Makefile.in TODO aclocal.m4 \
+config.guess config.sub configure configure.in install-sh ltconfig \
+ltmain.sh missing mkinstalldirs
DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
@@
-317,6
+316,7
@@
clean-am: clean-tags clean-generic mostlyclean-am
clean: clean-recursive
distclean-am: distclean-tags distclean-generic clean-am
clean: clean-recursive
distclean-am: distclean-tags distclean-generic clean-am
+ -rm -f libtool
distclean: distclean-recursive
-rm -f config.status
distclean: distclean-recursive
-rm -f config.status
@@
-343,16
+343,19
@@
installdirs mostlyclean-generic distclean-generic clean-generic \
maintainer-clean-generic clean mostlyclean distclean maintainer-clean
maintainer-clean-generic clean mostlyclean distclean maintainer-clean
-yaz-config:
+yaz-config: Makefile
+ @rm -f yaz-config
@echo "#!/bin/sh" >yaz-config
@echo "#!/bin/sh" >yaz-config
- @echo "# YAZ settings for developers" >>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 "YAZBIN=\"`pwd`/bin\"" >>yaz-config
@echo "YAZTAB=\"`pwd`/tab\"" >>yaz-config
- @echo "YAZLIB=\"-L`pwd`/lib -lyaz @LIBS@\"" >>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:
@echo "YAZINC=\"-I`pwd`/include\"" >>yaz-config
chmod +x yaz-config
dist-hook:
+ cd doc; make
mkdir $(distdir)/win
-cp $(srcdir)/win/* $(distdir)/win
mkdir $(distdir)/win
-cp $(srcdir)/win/* $(distdir)/win