X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/809484570008da67b0dcd291af7673481fff52f6..d11c00113be00bf5459970383b9e1fbc6ea8e7ba:/buildlib/environment.mak.in

diff --git a/buildlib/environment.mak.in b/buildlib/environment.mak.in
index bf676e643..1b0e0b268 100644
--- a/buildlib/environment.mak.in
+++ b/buildlib/environment.mak.in
@@ -29,18 +29,16 @@ DEBIANDOC_HTML = @DEBIANDOC_HTML@
 DEBIANDOC_TEXT = @DEBIANDOC_TEXT@
 
 # SGML for the man pages
-NSGMLS = @NSGMLS@
-SGMLSPL = @SGMLSPL@
-DOCBOOK2MAN := $(wildcard /usr/lib/perl5/sgmlspl-specs/docbook2man-spec.pl)
+DOCBOOK2MAN := @DOCBOOK2MAN@
+
+# XML for the man pages
+XMLTO := @XMLTO@
 
 # Gettext settings
 GMSGFMT = @GMSGFMT@
 XGETTEXT = @XGETTEXT@
 MSGCOMM:=$(dir $(XGETTEXT))/msgcomm
 MSGMERGE:=$(dir $(XGETTEXT))/msgmerge
-CATALOGS = @CATALOGS@
-USE_NLS = @USE_NLS@
-USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 BASH = @BASH@
 
 # Various library checks
@@ -51,15 +49,17 @@ PYTHONPREFIX = @PYTHONPREFIX@
 PYTHONEXECPREFIX = @PYTHONEXECPREFIX@
 PYTHONINCLUDE = @PYTHONINCLUDE@
 DB2LIB = @DB2LIB@
+INTLLIBS = @INTLLIBS@
 
 # Shim Headerfile control
 HAVE_C9X = @HAVE_C9X@
 HAVE_STATVFS = @HAVE_STATVFS@
+HAVE_TIMEGM = @HAVE_TIMEGM@
 NEED_SOCKLEN_T_DEFINE = @NEED_SOCKLEN_T_DEFINE@
 
 # Shared library things
 HOST_OS = @host_os@
-ifneq ($(words $(filter linux-gnu gnu%,$(HOST_OS))),0)
+ifneq ($(words $(filter linux-gnu gnu% %gnu,$(HOST_OS))),0)
    SONAME_MAGIC=-Wl,-soname -Wl,
    LFLAGS_SO=
 else