~mdw
/
adns
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
+ * Find install-sh properly when we need to use it, and chmod it +x.
[adns]
/
settings.make.in
diff --git
a/settings.make.in
b/settings.make.in
index
0967cd5
..
8c19363
100644
(file)
--- a/
settings.make.in
+++ b/
settings.make.in
@@
-2,10
+2,10
@@
# used by autoconf/configure to generate settings.make
#
# This file is
# used by autoconf/configure to generate settings.make
#
# This file is
-# Copyright (C) 1997-
1999
Ian Jackson <ian@davenant.greenend.org.uk>
+# Copyright (C) 1997-
2000
Ian Jackson <ian@davenant.greenend.org.uk>
#
# It is part of adns, which is
#
# It is part of adns, which is
-# Copyright (C) 1997-
1999
Ian Jackson <ian@davenant.greenend.org.uk>
+# Copyright (C) 1997-
2000
Ian Jackson <ian@davenant.greenend.org.uk>
# Copyright (C) 1999 Tony Finch <dot@dotat.at>
#
# This program is free software; you can redistribute it and/or modify
# Copyright (C) 1999 Tony Finch <dot@dotat.at>
#
# This program is free software; you can redistribute it and/or modify
@@
-26,11
+26,14
@@
MAJOR= 0
MINOR= 1
SHLIBFILE= @SHLIBFILE@
SHLIBSONAME= @SHLIBSONAME@
MINOR= 1
SHLIBFILE= @SHLIBFILE@
SHLIBSONAME= @SHLIBSONAME@
+SHLIBFORLINK= @SHLIBFORLINK@
CC= @CC@
CFLAGS= $(AUTOCFLAGS) $(WARNS) $(WERROR) $(DIRCFLAGS) $(XCFLAGS)
CC= @CC@
CFLAGS= $(AUTOCFLAGS) $(WARNS) $(WERROR) $(DIRCFLAGS) $(XCFLAGS)
+LDFLAGS= $(AUTOLDFLAGS) $(DIRLDFLAGS) $(XLDFLAGS)
LDLIBS= @LIBS@ $(XLIBS)
AUTOCFLAGS= @CFLAGS@
LDLIBS= @LIBS@ $(XLIBS)
AUTOCFLAGS= @CFLAGS@
+AUTOLDFLAGS= @LDFLAGS@
WARNS= @WARNS@
#WERROR= -Werror
WARNS= @WARNS@
#WERROR= -Werror
@@
-49,19
+52,25
@@
bin_dir= $(exec_prefix)/bin
lib_dir= $(exec_prefix)/lib
include_dir= $(prefix)/include
lib_dir= $(exec_prefix)/lib
include_dir= $(prefix)/include
-INSTALL= install -c
+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:
INSTALL_PROGRAM= $(INSTALL) -m 755 $(INSTALL_PROGRAM_FLAGS)
INSTALL_DATA= $(INSTALL) -m 644
all: $(TARGETS)
clean mostlyclean:
- rm -f *.o *.tmp*
+ rm -f *.o *.tmp*
*.so *.so.*
distclean: clean
rm -f $(TARGETS) *~ ./#*# core *.orig *.rej Makefile
distclean: clean
rm -f $(TARGETS) *~ ./#*# core *.orig *.rej Makefile
-distprep: $(AUTOCSRCS)
+distprep: $(AUTOCSRCS)
$(AUTOCHDRS)
maintainer-clean: distclean
maintainer-clean: distclean
- -rm -f $(AUTOCSRCS)
+ -rm -f $(AUTOCSRCS)
$(AUTOCHDRS)