(The first part of this commit died with a SIGPIPE from the CVS server.)

Overall UNIX build system improvements:

* Makefile header is now completely dynamic
* Absolute paths in (top_)?(src|build)dir and VPATH
  (fixes Tru64 support)
* VPATH does not contain variables anymore
  (fixes UnixWare support)

diff --git a/ext/aspell/Makefile.in b/ext/aspell/Makefile.in
index 1c5ad5182287dcad940831f34c62d33691def9b0..94ffb01cf586829aebb724e2ff45e59de192c81b 100644 (file)
--- a/ext/aspell/Makefile.in
+++ b/ext/aspell/Makefile.in
@@ -1,10 +1,5 @@
 
-DEPTH     = ../..
-topsrcdir = @topsrcdir@
-srcdir    = @srcdir@
-VPATH     = @srcdir@
-
 LTLIBRARY_NAME    = libaspell.la
 LTLIBRARY_SOURCES = aspell.c
 
-include $(topsrcdir)/build/ltlib.mk
+include $(top_srcdir)/build/ltlib.mk

diff --git a/ext/bcmath/Makefile.in b/ext/bcmath/Makefile.in
index 63953d35e08dadde46efa7cdff631a47ecf914f7..e8517a459c1f811df6cd81841c3d87ad3ce66e43 100644 (file)
--- a/ext/bcmath/Makefile.in
+++ b/ext/bcmath/Makefile.in
@@ -1,11 +1,6 @@
 
-DEPTH     = ../..
-topsrcdir = @topsrcdir@
-srcdir    = @srcdir@
-VPATH     = @srcdir@
-
 LTLIBRARY_NAME    = libbcmath.la
 LTLIBRARY_SOURCES = bcmath.c number.c
 
-include $(topsrcdir)/build/ltlib.mk
+include $(top_srcdir)/build/ltlib.mk
 

diff --git a/ext/calendar/Makefile.in b/ext/calendar/Makefile.in
index 9ffcafdc38054fe9b3159cf806b04a70488b355d..1b49f58b8f7e78724512a76f09d7f4f545746a7f 100644 (file)
--- a/ext/calendar/Makefile.in
+++ b/ext/calendar/Makefile.in
@@ -1,11 +1,5 @@
-# $Id$
-
-DEPTH     = ../..
-topsrcdir = @topsrcdir@
-srcdir    = @srcdir@
-VPATH     = @srcdir@
 
 LTLIBRARY_NAME    = libcalendar.la
 LTLIBRARY_SOURCES = calendar.c dow.c french.c gregor.c jewish.c julian.c easter.c cal_unix.c
 
-include $(topsrcdir)/build/ltlib.mk
+include $(top_srcdir)/build/ltlib.mk

diff --git a/ext/cpdf/Makefile.in b/ext/cpdf/Makefile.in
index 11961fe66eff38d34701af87abe513b2298dde56..ee8e1cd1cb29ef968beb329f2a67aeadffe3cc17 100644 (file)
--- a/ext/cpdf/Makefile.in
+++ b/ext/cpdf/Makefile.in
@@ -1,10 +1,5 @@
 
-DEPTH     = ../..
-topsrcdir = @topsrcdir@
-srcdir    = @srcdir@
-VPATH     = @srcdir@
-
 LTLIBRARY_NAME    = libcpdf.la
 LTLIBRARY_SOURCES = cpdf.c
 
-include $(topsrcdir)/build/ltlib.mk
+include $(top_srcdir)/build/ltlib.mk

diff --git a/ext/cybercash/Makefile.in b/ext/cybercash/Makefile.in
index fc24880d42f26fe89ba159e27898a528d4b7f257..3d3c1d39e71ab2af3b53535e5034b2f03c1c5e3b 100644 (file)
--- a/ext/cybercash/Makefile.in
+++ b/ext/cybercash/Makefile.in
@@ -1,10 +1,5 @@
 
-DEPTH     = ../..
-topsrcdir = @topsrcdir@
-srcdir    = @srcdir@
-VPATH     = @srcdir@
-
 LTLIBRARY_NAME    = libcybercash.la
 LTLIBRARY_SOURCES = cybercash.c
 
-include $(topsrcdir)/build/ltlib.mk
+include $(top_srcdir)/build/ltlib.mk

diff --git a/ext/dav/Makefile.in b/ext/dav/Makefile.in
index c3522068b49bdfe6b53df88d9ff8f36637962d35..5e3149ea236e88a3aeabe970a05b8d510d11f33f 100644 (file)
--- a/ext/dav/Makefile.in
+++ b/ext/dav/Makefile.in
@@ -1,10 +1,5 @@
 
-DEPTH     = ../..
-topsrcdir = @topsrcdir@
-srcdir    = @srcdir@
-VPATH     = @srcdir@
-
 LTLIBRARY_NAME    = libdav.la
 LTLIBRARY_SOURCES = dav.c
 
-include $(topsrcdir)/build/ltlib.mk
+include $(top_srcdir)/build/ltlib.mk