Brown-paper-bag fixes.

  * Use `mLib' rather than `mlib' as the tarball name.  Otherwise, the
    header files end up in /use/include/mlib and nothing can find them.

  * Actually include `config.h' in the necessary places.

diff --git a/configure.ac b/configure.ac
index 52db7c77f98dc9e4cf7e56d4bed051d8dbf78f48..e71e10f3dcec119b4ada710822df5fdede70c37d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -28,7 +28,7 @@ dnl--------------------------------------------------------------------------
 dnl Initialization.
 
 mdw_AUTO_VERSION
-AC_INIT([mLib], AUTO_VERSION, [mdw@distorted.org.uk])
+AC_INIT([mLib], AUTO_VERSION, [mdw@distorted.org.uk], [mLib])
 AC_CONFIG_SRCDIR([mLib.pc.in])
 AC_CONFIG_AUX_DIR([config])
 AM_INIT_AUTOMAKE([foreign])

diff --git a/debian/changelog b/debian/changelog
index e451fe156867d12bdc13807c3bded5b639dca283..efdac188957d98c04333c9314d738f6a9a19f83b 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+mlib (2.0.7) experimental; urgency=low
+
+  * The new build system put the headers in /usr/include/mlib, where
+    nothing could find them.  Put them back in /usr/include/mLib where
+    they belong.
+  * Actually include config.h in the correct places, so that, for example,
+    dstr_putf doesn't explode.
+
+ -- Mark Wooding <mdw@distorted.org.uk>  Sun, 28 Dec 2008 21:23:59 +0000
+
 mlib (2.0.6) experimental; urgency=low
 
   * Build system overhaul.

diff --git a/debian/mlib-dev.install b/debian/mlib-dev.install
index 2a4e59c027946a34c58e45b4622f989bb625572b..6c3b3edb2fa156c7a44c579e9c966de78118066e 100644 (file)
--- a/debian/mlib-dev.install
+++ b/debian/mlib-dev.install
@@ -1,5 +1,6 @@
 debian/tmp/usr/include
 debian/tmp/usr/lib/libmLib.a
+debian/tmp/usr/lib/libmLib.la
 debian/tmp/usr/lib/libmLib.so
 debian/tmp/usr/lib/pkgconfig
 debian/tmp/usr/share/man/man3

diff --git a/debian/mlib2.install b/debian/mlib2.install
index 68af946d4bedda08368c1b6457194d3c50639c9f..6dfee5e554563f683e0504bd4c1fbbcb78ebd779 100644 (file)
--- a/debian/mlib2.install
+++ b/debian/mlib2.install
@@ -1,2 +1,2 @@
 debian/tmp/usr/lib/libmLib.so.*
-debian/tmp/usr/lib/mlib/bres
+debian/tmp/usr/lib/mLib/bres

diff --git a/dputf.c b/dputf.c
index ef8273c0a6cd57e8b5c6f54fc79efd0e51749407..2c29aad0d8fb814b6c4cb025dadfeba9e289a9d8 100644 (file)
--- a/dputf.c
+++ b/dputf.c
@@ -29,6 +29,8 @@
 
 /*----- Header files ------------------------------------------------------*/
 
+#include "config.h"
+
 #include <ctype.h>
 #include <math.h>
 #include <stdarg.h>

diff --git a/fdpass.c b/fdpass.c
index e8899535e126877e64c64c3915dcff8a18b56636..8a33c2b366a8a3ab276b4372ddde6715a9a7840a 100644 (file)
--- a/fdpass.c
+++ b/fdpass.c
@@ -29,6 +29,8 @@
 
 /*----- Header files ------------------------------------------------------*/
 
+#include "config.h"
+
 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>