@@ -1,13 +1,15 @@

 adns (1.3); urgency=low

-  Bugfixes:
-  * In configure.in, quote macro name argument to define() to
-    suppress spurious autoconf error.  (Report from Mihai Ibanescu.)
+  Portability fixes:
   * Cast ptrdiff_t to int for %.*s length in adnsheloex and adnslogres,
     as is required.  (Report from Jim Meyering.)
-  * Use autoconf's values for {bin,lib,include}_dir rather than inventing
+  * In configure.in, quote macro name argument to define() to
+    suppress spurious autoconf error.  (Report from Mihai Ibanescu.)
+  * Use autoconf's values for {bin,lib,include}dir rather than inventing
     our own from @exec_prefix@, making configure --libdir work.
     (Patch from Mihai Ibanescu.)
+  * Remove spurious `_' from {bin,lib,include}dir Makefile variables.
+    (Report from Mihai Ibanescu.)

  --

diff --git a/changelog b/changelog
index 7d370dd4a93ebccb9122fd2ddf7e1f0d51f68dd8..7eea428447d5173142fc18f2bcd9dd4ebc371c21 100644 (file)
--- a/changelog
+++ b/changelog
@@ -1,13 +1,15 @@
 adns (1.3); urgency=low
 
-  Bugfixes:
-  * In configure.in, quote macro name argument to define() to
-    suppress spurious autoconf error.  (Report from Mihai Ibanescu.)
+  Portability fixes:
   * Cast ptrdiff_t to int for %.*s length in adnsheloex and adnslogres,
     as is required.  (Report from Jim Meyering.)
-  * Use autoconf's values for {bin,lib,include}_dir rather than inventing
+  * In configure.in, quote macro name argument to define() to
+    suppress spurious autoconf error.  (Report from Mihai Ibanescu.)
+  * Use autoconf's values for {bin,lib,include}dir rather than inventing
     our own from @exec_prefix@, making configure --libdir work.
     (Patch from Mihai Ibanescu.)
+  * Remove spurious `_' from {bin,lib,include}dir Makefile variables.
+    (Report from Mihai Ibanescu.)
 
  --
 

diff --git a/client/Makefile.in b/client/Makefile.in
index 2d339b930e59ac4f1d444cef3cc46abf3643d540..da0cdf1314a9d3587d403c7113583d777b4a96c9 100644 (file)
--- a/client/Makefile.in
+++ b/client/Makefile.in
@@ -58,12 +58,12 @@ ADNSDIR=    $(srcdir)/../src/
 all:           $(TARGETS)
 
 install:       $(TARG_INSTALL)
-               mkdir -p $(bin_dir)
+               mkdir -p $(bindir)
                set -xe; for f in $(TARG_INSTALL); \
-                       do $(INSTALL_PROGRAM) $$f $(bin_dir)/$$f; done
+                       do $(INSTALL_PROGRAM) $$f $(bindir)/$$f; done
 
 uninstall:
-               for f in $(TARGETS); do rm -f $(bin_dir)/$$f; done
+               for f in $(TARGETS); do rm -f $(bindir)/$$f; done
 
 adnshost:      $(ADH_OBJS) $(DYNAMIC_DEP)
                $(CC) $(LDFLAGS) $(ADH_OBJS) $(DYNAMIC_LINK) -o $@ $(LDLIBS)

diff --git a/dynamic/Makefile.in b/dynamic/Makefile.in
index 032530479d23cf8c06988e7cc7beeefc01a7c57f..f26fe7d035893960372bef9f8482fd9826b926d5 100644 (file)
--- a/dynamic/Makefile.in
+++ b/dynamic/Makefile.in
@@ -30,13 +30,13 @@ include             $(srcdir)/../src/adns.make
 ALLOBJS=       $(addsuffix _p.o, $(basename $(LIBOBJS)))
 
 install:
-               mkdir -p $(lib_dir)
-               $(INSTALL_PROGRAM) $(SHLIBFILE) $(lib_dir)/$(SHLIBFILE)
-               ln -sf $(SHLIBFILE) $(lib_dir)/$(SHLIBSONAME)
-               ln -sf $(SHLIBSONAME) $(lib_dir)/$(SHLIBFORLINK)
+               mkdir -p $(libdir)
+               $(INSTALL_PROGRAM) $(SHLIBFILE) $(libdir)/$(SHLIBFILE)
+               ln -sf $(SHLIBFILE) $(libdir)/$(SHLIBSONAME)
+               ln -sf $(SHLIBSONAME) $(libdir)/$(SHLIBFORLINK)
 
 uninstall:
-               rm -f $(lib_dir)/$(SHLIBFILE) $(lib_dir)/$(SHLIBSONAME)
+               rm -f $(libdir)/$(SHLIBFILE) $(libdir)/$(SHLIBSONAME)
 
 $(SHLIBFORLINK):
                ln -s $(SHLIBSONAME) $(SHLIBFORLINK)

diff --git a/settings.make.in b/settings.make.in
index f1ae5cb2b6f38442c9fd0169a3d5ca48a4042295..6b5444f363e5bccf402a94adc2da892d463a28ef 100644 (file)
--- a/settings.make.in
+++ b/settings.make.in
@@ -47,9 +47,9 @@ MKSHLIB_3=    @MKSHLIB_3@
 
 prefix=                @prefix@
 exec_prefix=   @exec_prefix@
-bin_dir=       @bindir@
-lib_dir=       @libdir@
-include_dir=   @includedir@
+bindir=                @bindir@
+libdir=                @libdir@
+includedir=    @includedir@
 
 AC_INSTALL=    @INSTALL@
 ifeq ($(AC_INSTALL),./install-sh -c)

diff --git a/src/Makefile.in b/src/Makefile.in
index 528856e30bd10992b2e0c605aa714fd39f6b04e5..7a7d055ca4a5aa62d7710ecc417bbaecb83968c2 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -28,14 +28,14 @@ include             $(srcdir)/../settings.make
 include                adns.make
 
 install:
-               mkdir -p $(lib_dir) $(include_dir)
+               mkdir -p $(libdir) $(includedir)
                set -xe; for f in $(TARGETS); \
-                       do $(INSTALL_DATA) $$f $(lib_dir)/$$f; done
-               $(INSTALL_DATA) $(srcdir)/../src/adns.h $(include_dir)/adns.h
+                       do $(INSTALL_DATA) $$f $(libdir)/$$f; done
+               $(INSTALL_DATA) $(srcdir)/../src/adns.h $(includedir)/adns.h
 
 uninstall:
-               for f in $(TARGETS); do rm -f $(lib_dir)/$$f; done
-               rm -f $(include_dir)/adns.h
+               for f in $(TARGETS); do rm -f $(libdir)/$$f; done
+               rm -f $(includedir)/adns.h
 
 ALLOBJS=       $(LIBOBJS)