the previously used VERSION didn't work everywhere so we are switching

[apt.git] / buildlib / environment.mak.in

diff --git a/buildlib/environment.mak.in b/buildlib/environment.mak.in
index 2d28e1c6749fe86cb7a1dd87c10d8feb0a8f759d..b8ddb34a2a3fb3019c33efaade74210fdc5705f5 100644 (file)
--- a/buildlib/environment.mak.in
+++ b/buildlib/environment.mak.in
@@ -2,6 +2,7 @@
 # if you want you can edit it, just don't re-run configure.
 
 PACKAGE = @PACKAGE@
 # if you want you can edit it, just don't re-run configure.
 
 PACKAGE = @PACKAGE@

+PACKAGE_VERSION = @PACKAGE_VERSION@

 
 # C++ compiler options
 CC = @CC@
 
 # C++ compiler options
 CC = @CC@


@@ -9,8 +10,6 @@ CPPFLAGS+= @CPPFLAGS@ @DEFS@ -D_REENTRANT -Wall
 CXX = @CXX@
 CXXFLAGS+= @CXXFLAGS@
 NUM_PROCS = @NUM_PROCS@
 CXX = @CXX@
 CXXFLAGS+= @CXXFLAGS@
 NUM_PROCS = @NUM_PROCS@

-GLIBC_VER = @GLIBC_VER@
-LIBSTDCPP_VER = @LIBSTDCPP_VER@

 
 # Linker stuff
 PICFLAGS+= -fPIC -DPIC
 
 # Linker stuff
 PICFLAGS+= -fPIC -DPIC


@@ -30,14 +29,11 @@ DEBIANDOC_TEXT = @DEBIANDOC_TEXT@
 
 DOXYGEN = @DOXYGEN@
 
 
 DOXYGEN = @DOXYGEN@
 

-# SGML for the man pages
-DOCBOOK2MAN := @DOCBOOK2MAN@
+# xsltproc for the man pages
+XSLTPROC := @XSLTPROC@

 
 

-# XML for the man pages
-XMLTO := @XMLTO@
-
-# XML for the man pages
-XMLTO := @XMLTO@
+# po4a for the man pages
+PO4A := @PO4A@

 
 # Gettext settings
 GMSGFMT = @GMSGFMT@
 
 # Gettext settings
 GMSGFMT = @GMSGFMT@


@@ -64,7 +60,7 @@ NEED_SOCKLEN_T_DEFINE = @NEED_SOCKLEN_T_DEFINE@
 
 # Shared library things
 HOST_OS = @host_os@
 
 # Shared library things
 HOST_OS = @host_os@

-ifneq ($(words $(filter linux-gnu gnu% %gnu,$(HOST_OS))),0)
+ifneq ($(words $(filter gnu% linux-gnu% kfreebsd-gnu% %-gnu,$(HOST_OS))),0)

    SONAME_MAGIC=-Wl,-soname -Wl,
    LFLAGS_SO=
 else
    SONAME_MAGIC=-Wl,-soname -Wl,
    LFLAGS_SO=
 else