[Man-db-announce] man-db-2.4.3 where builddir != srcdir

[Bernard Leak]

Dear List,
                 man-db really needs to be autotooled properly, I 
suppose, but I'm not
Hercules and I'll leave the Augean stable where it is.

However, one thing I have done is to un-break building away from the source
directory.  There was some confusion about the proper include paths
(in the libdb directory, Makefile.in specified $top_srcdir where 
$top_builddir
was meant).  There are also various places where '..' is correctly given 
(referring
to $(top_builddir), but it's less misdirecting to use the variable.

I've also removed a few misplaced tabs (on lines containing precisely a tab
and nothing else) from Makefile.in files.



                                                                       
Bernard Leak.



#Output of diff -Nru man-db-2.4.3/src/Makefile.in{-old,}
--- man-db-2.4.3/src/Makefile.in-old    2004-01-27 21:19:46.000000000 +0000
+++ man-db-2.4.3/src/Makefile.in        2006-08-12 22:16:01.000000000 +0100
@@ -24,6 +24,7 @@
 libdir = @libdir@
 VPATH = @srcdir@
 top_srcdir = @top_srcdir@
+top_builddir = @top_builddir@
 subdir = src
 gnulocaledir = $(prefix)/share/locale
 
@@ -40,7 +41,7 @@
 
 MANDEFS = -DCONFIG_FILE=\"$(config_file)\" \
        -DLOCALEDIR=\"$(gnulocaledir)\" $(DEFS_$(subst /,_,$@))
-MANCPPFLAGS = -I../include -I$(top_srcdir) -I$(srcdir) -I- -I../intl
+MANCPPFLAGS = -I$(top_builddir)/include -I$(top_builddir) -I$(top_srcdir) 
-I$(srcdir) -I- -I$(top_builddir)/intl
 
 #----------------------------------------------------------------#
 # user changeable definitions can be found in ../include/Defines #
@@ -173,7 +174,7 @@
 
 TAGS:
        $(MKTAGS) $(srcdir)/*.[chl]
-       
+
 # These lines sort out proper dependencies.
 ifeq (,$(findstring clean,$(MAKECMDGOALS)))
   SRCS = $(notdir $(wildcard $(srcdir)/*.c))

#Output of diff -Nru man-db-2.4.3/lib/Makefile.in{-old,}
--- man-db-2.4.3/lib/Makefile.in-old    2004-11-08 10:11:28.000000000 +0000
+++ man-db-2.4.3/lib/Makefile.in        2006-08-12 22:15:11.000000000 +0100
@@ -25,12 +25,13 @@
 srcdir = @srcdir@
 VPATH = @srcdir@
 top_srcdir = @top_srcdir@
+top_builddir = @top_builddir@
 
 include ../include/Defines
 
 .PHONY: $(DEFAULT_TARGETS) test
 
-MANCPPFLAGS = -I../include -I$(top_srcdir) -I$(srcdir) -I-
+MANCPPFLAGS = -I$(top_builddir)/include -I${top_builddir} -I$(top_srcdir) 
-I$(srcdir) -I-
 
 ALLSRCS = alloca.c basename.c cleanup.c error.c fnmatch.c getopt.c getopt1.c \
          glob.c memcmp.c putenv.c realpath.c rename.c \

--- man-db-2.4.3/libdb/Makefile.in-old  2003-04-07 08:09:46.000000000 +0100
+++ man-db-2.4.3/libdb/Makefile.in      2006-08-12 22:25:16.000000000 +0100
#Output of diff -Nru man-db-2.4.3/libdb/Makefile.in{-old,}
@@ -26,15 +26,16 @@
 srcdir = @srcdir@
 VPATH = @srcdir@
 top_srcdir = @top_srcdir@
+top_builddir = @top_builddir@
 
 USE_NLS = @USE_NLS@
 
-include $(top_srcdir)/include/Defines
+include $(top_builddir)/include/Defines
 
 .PHONY: $(DEFAULT_TARGETS)
 
 MANDEFS =
-MANCPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir) -I$(srcdir) -I-
+MANCPPFLAGS = -I$(top_builddir)/include -I$(top_builddir) -I$(top_srcdir) 
-I$(srcdir) -I-
 ifeq ($(USE_NLS),yes)
 MANCPPFLAGS += -I$(top_srcdir)/intl
 endif
@@ -61,7 +62,7 @@
 
 realclean: distclean
        rm -f tags
-       
+
 TAGS:
        $(MKTAGS) $(srcdir)/*.[ch]
 

#Output of diff -Nru man-db-2.4.3/libdb/Makefile.in{-old,}
--- man-db-2.4.3/libdb/Makefile.in-old  2006-08-12 22:26:48.000000000 +0100
+++ man-db-2.4.3/libdb/Makefile.in      2006-08-12 22:29:10.000000000 +0100
#Output of diff -Nru man-db-2.4.3/zsoelim/Makefile.in{-old,}
--- man-db-2.4.3/zsoelim/Makefile.in-old        2003-04-15 18:17:08.000000000 
+0100
+++ man-db-2.4.3/zsoelim/Makefile.in    2006-08-12 23:16:34.000000000 +0100
@@ -23,6 +23,7 @@
 srcdir = @srcdir@
 VPATH = @srcdir@
 top_srcdir = @top_srcdir@
+top_builddir = @top_builddir@
 INSTALL = @INSTALL@
 
 include ../include/Defines
@@ -29,7 +29,7 @@
 
 .PHONY:        $(DEFAULT_TARGETS)
 
-MANCPPFLAGS := -I../include -I$(top_srcdir) -I-
+MANCPPFLAGS := -I$(top_builddir)/include -I$(top_builddir) -I$(top_srcdir) -I-
 override LDLIBS = -lc @LEXLIB@
 
 # You may need to modify these options if you have lex instead of flex
@@ -50,7 +50,7 @@
 
 uninstall:
        rm -f $(DESTDIR)$(bindir)/$(zsoelim)
-       
+
 clean:
        rm -f zsoelim *.o core *~