From b3a0ac5ea5b0f341ab0c1fe0a68a7855fe5c36c1 Mon Sep 17 00:00:00 2001 Message-Id: From: Mark Wooding Date: Sun, 28 Dec 2008 19:22:54 +0000 Subject: [PATCH] Brown-paper-bag fixes. Organization: Straylight/Edgeware From: Mark Wooding * 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. --- configure.ac | 2 +- debian/changelog | 10 ++++++++++ debian/mlib-dev.install | 1 + debian/mlib2.install | 2 +- dputf.c | 2 ++ fdpass.c | 2 ++ 6 files changed, 17 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 52db7c7..e71e10f 100644 --- 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 e451fe1..efdac18 100644 --- 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 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 2a4e59c..6c3b3ed 100644 --- 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 68af946..6dfee5e 100644 --- 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 ef8273c..2c29aad 100644 --- a/dputf.c +++ b/dputf.c @@ -29,6 +29,8 @@ /*----- Header files ------------------------------------------------------*/ +#include "config.h" + #include #include #include diff --git a/fdpass.c b/fdpass.c index e889953..8a33c2b 100644 --- a/fdpass.c +++ b/fdpass.c @@ -29,6 +29,8 @@ /*----- Header files ------------------------------------------------------*/ +#include "config.h" + #include #include #include -- [mdw]