[Gsrc-commit] /srv/bzr/gsrc/trunk r1028: clean up gettext

[Brandon Invergo]

------------------------------------------------------------
revno: 1028
committer: Brandon Invergo <address@hidden>
branch nick: trunk
timestamp: Fri 2012-11-02 14:35:20 +0100
message:
  clean up gettext
added:
  gnu/gettext/config.mk
modified:
  gnu/gettext/Makefile

=== modified file 'gnu/gettext/Makefile'
--- a/gnu/gettext/Makefile      2012-08-25 22:15:17 +0000
+++ b/gnu/gettext/Makefile      2012-11-02 13:35:20 +0000
@@ -1,19 +1,26 @@
 GARNAME = gettext
 GARVERSION = 0.18.1.1
+HOME_URL = http://www.gnu.org/software/gettext/
+DESCRIPTION = A well integrated set of translation tools and documentation
+
+######################################################################
 
 MASTER_SITES = $(MASTER_GNU)
-MASTER_SUBDIR = gettext/
-
+MASTER_SUBDIR = $(GARNAME)/
 DISTFILES = $(DISTNAME).tar.gz
 SIGFILES = $(DISTNAME).tar.gz.sig
 
 BUILDDEPS = libiconv
-# LIBDEPS = 
+LIBDEPS = glib ncurses 
 
-HOME_URL = http://www.gnu.org/software/gettext/
-DESCRIPTION = GNU gettext, a well integrated set of translation tools and 
documentation
+######################################################################
 
 include ../../gar.lib/auto.mk
+include config.mk
+
+CONFIGURE_ARGS += --with-libglib-2.0-prefix=$(prefix) \
+                 --with-libiconv-prefix=$(prefix) \
+                 --with-libncurses-prefix=$(prefix) 
 
 pre-build:
        exec sed -i -e '/gets is a security/d' 
$(WORKSRC)/gettext-runtime/gnulib-lib/stdio.in.h

=== added file 'gnu/gettext/config.mk'
--- a/gnu/gettext/config.mk     1970-01-01 00:00:00 +0000
+++ b/gnu/gettext/config.mk     2012-11-02 13:35:20 +0000
@@ -0,0 +1,4 @@
+## Configuration options for gettext ##
+
+CONFIGURE_OPTS ?= 
+BUILD_OPTS ?=