merge from the debian-sid branch

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

diff --git a/buildlib/environment.mak.in b/buildlib/environment.mak.in
index 2d28e1c6749fe86cb7a1dd87c10d8feb0a8f759d..b3afca0ad6d2e9de58757b7dd5d62018c709d1b9 100644 (file)
--- a/buildlib/environment.mak.in
+++ b/buildlib/environment.mak.in
@@ -36,8 +36,11 @@ DOCBOOK2MAN := @DOCBOOK2MAN@
 # XML for the man pages
 XMLTO := @XMLTO@
 
-# XML for the man pages
-XMLTO := @XMLTO@
+# po4a for the man pages
+XSLTPROC := @XSLTPROC@
+
+# po4a for the man pages
+PO4A := @PO4A@
 
 # Gettext settings
 GMSGFMT = @GMSGFMT@
@@ -64,7 +67,7 @@ NEED_SOCKLEN_T_DEFINE = @NEED_SOCKLEN_T_DEFINE@
 
 # 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