X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=adns.git;a=blobdiff_plain;f=settings.make.in;h=cfb44e00ddf0d4c154900a78d5571130135000ac;hp=70d7a8a95b48ab0bd7b8fede43d0a1011e254092;hb=91e6c883fe1b705b69546662fbc0ee1a5b688163;hpb=11b3519314b471bb042bf3a69bbbb3adaa7aa19d

diff --git a/settings.make.in b/settings.make.in
index 70d7a8a..cfb44e0 100644
--- a/settings.make.in
+++ b/settings.make.in
@@ -1,8 +1,13 @@
 # settings.make.in - main configuration settings for Makefiles,
 #  used by autoconf/configure to generate settings.make
 #  
-#  This file is part of adns, which is Copyright (C) 1997, 1998 Ian Jackson
+#  This file is
+#    Copyright (C) 1997-2000 Ian Jackson <ian@davenant.greenend.org.uk>
 #
+#  It is part of adns, which is
+#    Copyright (C) 1997-2000 Ian Jackson <ian@davenant.greenend.org.uk>
+#    Copyright (C) 1999-2000 Tony Finch <dot@dotat.at>
+#  
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
 #  the Free Software Foundation; either version 2, or (at your option)
@@ -17,20 +22,24 @@
 #  along with this program; if not, write to the Free Software Foundation,
 #  Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. 
 
-srcdir=		@srcdir@
-VPATH=		@srcdir@$(SUBDIR)
-
-MAJOR=		0
-MINOR=		1
+MAJOR=		1
+MINOR=		0
 SHLIBFILE=	@SHLIBFILE@
 SHLIBSONAME=	@SHLIBSONAME@
+SHLIBFORLINK=	@SHLIBFORLINK@
 
 CC=		@CC@
 CFLAGS=		$(AUTOCFLAGS) $(WARNS) $(WERROR) $(DIRCFLAGS) $(XCFLAGS)
+LDFLAGS=	$(AUTOLDFLAGS) $(DIRLDFLAGS) $(XLDFLAGS)
+LDLIBS=		@LIBS@ $(XLIBS)
 AUTOCFLAGS=	@CFLAGS@
+AUTOLDFLAGS=	@LDFLAGS@
 WARNS=		@WARNS@
 #WERROR=	-Werror
 
+M4=		m4
+RANLIB=		@RANLIB@
+
 SHLIBCC=	@SHLIBCC@
 
 MKSHLIB_1=	@MKSHLIB_1@
@@ -38,19 +47,30 @@ MKSHLIB_2=	@MKSHLIB_2@
 MKSHLIB_3=	@MKSHLIB_3@
 
 prefix=		@prefix@
-bin_dir=	$(prefix)/bin
-lib_dir=	$(prefix)/lib
+exec_prefix=	@exec_prefix@
+bin_dir=	$(exec_prefix)/bin
+lib_dir=	$(exec_prefix)/lib
 include_dir=	$(prefix)/include
 
-INSTALL=	install -o 0 -g 0
-INSTALL_LIB=	$(INSTALL) -m 755
-INSTALL_BIN=	$(INSTALL) -m 755
-INSTALL_HDR=	$(INSTALL) -m 644
+AC_INSTALL=	@INSTALL@
+ifeq ($(AC_INSTALL),./install-sh -c)
+INSTALL=	$(srcdir)/../$(AC_INSTALL)
+else
+INSTALL=	$(AC_INSTALL)
+endif
+
+INSTALL_PROGRAM=	$(INSTALL) -m 755 $(INSTALL_PROGRAM_FLAGS)
+INSTALL_DATA=		$(INSTALL) -m 644
+
+all:			$(TARGETS)
+
+clean mostlyclean:
+		rm -f *.o *.tmp* *.so *.so.*
 
-all:		$(TARGETS)
+distclean:		clean
+		rm -f $(TARGETS) *~ ./#*# core *.orig *.rej Makefile
 
-clean:
-		rm -f *.o 
+distprep:		$(AUTOCSRCS) $(AUTOCHDRS)
 
-maintainer-clean distclean:	clean
-		rm -f $(TARGETS) *~ ./#*# core *.orig *.rej
+maintainer-clean:	distclean
+		-rm -f $(AUTOCSRCS) $(AUTOCHDRS)