diff options
Diffstat (limited to 'buildlib')
| -rw-r--r-- | buildlib/apti18n.h.in | 2 | ||||
| -rw-r--r-- | buildlib/archtable | 29 | ||||
| -rw-r--r-- | buildlib/config.h.in | 7 | ||||
| -rw-r--r-- | buildlib/environment.mak.in | 4 | ||||
| -rw-r--r-- | buildlib/ostable | 21 | ||||
| -rw-r--r-- | buildlib/sizetable | 1 |
6 files changed, 8 insertions, 56 deletions
diff --git a/buildlib/apti18n.h.in b/buildlib/apti18n.h.in index 812457643..a5b91b1ee 100644 --- a/buildlib/apti18n.h.in +++ b/buildlib/apti18n.h.in @@ -14,8 +14,10 @@ # else # define _(x) gettext(x) # endif +# define N_(x) x #else // apt will not use any gettext # define setlocale(a, b) # define _(x) x +# define N_(x) x #endif diff --git a/buildlib/archtable b/buildlib/archtable deleted file mode 100644 index 197529202..000000000 --- a/buildlib/archtable +++ /dev/null @@ -1,29 +0,0 @@ -# This file contains a table of known architecture strings, with -# things to map them to. `configure' will take the output of the -# autoconf cannon macros and look in here. This only deals with architecture -# (CPU) names. - -# The left side is a regex for awk - -i.86 i386 -pentium i386 -sparc sparc -sparc64 sparc -alpha.* alpha -m68k m68k -arm.*b armeb -arm.* arm -powerpc powerpc -ppc powerpc -powerpc64 ppc64 -mipsel mipsel -mipseb mips -mips mips -sheb sheb -shel sh -sh sh -hppa.* hppa -ia64 ia64 -s390 s390 -s390x s390x -x86_64 amd64 diff --git a/buildlib/config.h.in b/buildlib/config.h.in index 8a65a229a..eddb16246 100644 --- a/buildlib/config.h.in +++ b/buildlib/config.h.in @@ -32,11 +32,8 @@ /* If there is no socklen_t, define this for the netdb shim */ #undef NEED_SOCKLEN_T_DEFINE -/* Define the cpu name string */ -#undef COMMON_CPU - -/* Define the on name string */ -#undef COMMON_OS +/* Define the arch name string */ +#undef COMMON_ARCH /* The version number string */ #undef VERSION diff --git a/buildlib/environment.mak.in b/buildlib/environment.mak.in index f5ee539ac..4e47692f5 100644 --- a/buildlib/environment.mak.in +++ b/buildlib/environment.mak.in @@ -28,6 +28,8 @@ INLINEDEPFLAG = -MD DEBIANDOC_HTML = @DEBIANDOC_HTML@ DEBIANDOC_TEXT = @DEBIANDOC_TEXT@ +DOXYGEN = @DOXYGEN@ + # SGML for the man pages DOCBOOK2MAN := @DOCBOOK2MAN@ @@ -62,7 +64,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 diff --git a/buildlib/ostable b/buildlib/ostable deleted file mode 100644 index ead7d771c..000000000 --- a/buildlib/ostable +++ /dev/null @@ -1,21 +0,0 @@ -# This file contains a table of known vendor-os strings, with -# things to map them to. `configure' will take the output of the -# autoconf cannon macros and look in here. This only deals with -# OS names. The right should be a common name like the arch table -# generates -# The final bit to build the Debian Architecture is done in init.cc -# The left side is a regex for awk, and the first match is used. - -# These are used by Debian -[^-]*-linux-.* linux -[^-]*-kfreebsd.*-gnu kfreebsd -[^-]*-knetbsd.*-gnu knetbsd -[^-]*-gnu[^-]* hurd - -# These are samples. -hp-hpux[^-]* hp-ux -sun-solaris[^-]* solaris -[^-]*-openbsd[^-]* openbsd - -# Catch all -.* unknown diff --git a/buildlib/sizetable b/buildlib/sizetable index 8b18528cf..b5782360c 100644 --- a/buildlib/sizetable +++ b/buildlib/sizetable @@ -21,3 +21,4 @@ m68k big 1 4 2 4 powerpc big 1 4 2 4 mips big 1 4 2 4 hppa big 1 4 2 4 +m32r big 1 4 2 4
\ No newline at end of file |