aboutsummaryrefslogtreecommitdiffstats
path: root/zlib/Makefile
diff options
context:
space:
mode:
Diffstat (limited to 'zlib/Makefile')
-rw-r--r--zlib/Makefile20
1 files changed, 10 insertions, 10 deletions
diff --git a/zlib/Makefile b/zlib/Makefile
index 26c6aa6d2..d63ebb229 100644
--- a/zlib/Makefile
+++ b/zlib/Makefile
@@ -66,13 +66,13 @@ host_alias = i586-pc-linux-gnu
host_triplet = i586-pc-linux-gnu
target_alias = i586-pc-linux-gnu
target_triplet = i586-pc-linux-gnu
-CATALOGS = en.mo de.mo it.mo fr.mo
-CATOBJEXT = .mo
+CATALOGS = en.gmo de.gmo it.gmo fr.gmo
+CATOBJEXT = .gmo
CC = gcc
CPP = gcc -E
-DATADIRNAME = lib
+DATADIRNAME = share
DYNLINK_LDFLAGS = -rdynamic
-G10_LOCALEDIR = /usr/local/lib/locale
+G10_LOCALEDIR = /usr/local/share/locale
GENCAT =
GMOFILES = en.gmo de.gmo it.gmo fr.gmo
GMSGFMT = /usr/local/bin/msgfmt
@@ -80,9 +80,9 @@ GT_NO =
GT_YES = #YES#
INCLUDE_LOCALE_H = #include <locale.h>
INSTOBJEXT = .mo
-INTLDEPS =
-INTLLIBS =
-INTLOBJS =
+INTLDEPS = $(top_builddir)/intl/libintl.a
+INTLLIBS = $(top_builddir)/intl/libintl.a
+INTLOBJS = $(GETTOBJS)
MKINSTALLDIRS = scripts/mkinstalldirs
MPI_EXTRA_ASM_OBJS =
MSGFMT = /usr/local/bin/msgfmt
@@ -90,9 +90,9 @@ PACKAGE = gnupg
POFILES = en.po de.po it.po fr.po
POSUB = po
RANLIB = ranlib
-USE_INCLUDED_LIBINTL = no
+USE_INCLUDED_LIBINTL = yes
USE_NLS = yes
-VERSION = 0.3.5
+VERSION = 0.3.5a
ZLIBS =
l =
@@ -122,7 +122,7 @@ LIBRARIES = $(noinst_LIBRARIES)
DEFS = -DHAVE_CONFIG_H -I. -I$(srcdir) -I..
CPPFLAGS =
LDFLAGS =
-LIBS = -ldl -lz
+LIBS = -ldl -lz
libzlib_a_LIBADD =
libzlib_a_OBJECTS = adler32.o compress.o crc32.o gzio.o uncompr.o \
deflate.o trees.o zutil.o inflate.o infblock.o inftrees.o infcodes.o \