diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2010-04-04 10:34:02 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-04-04 10:34:02 +0200 |
| commit | 5042ac8e5927d0089d3902b1c37e5bcc1565d053 (patch) | |
| tree | cd2be3085808c5ac59dd70f9c610c6a40bfe3ffd /package/gettext | |
| parent | 401dabf66529cfb5ab47b4c78d5e25fd493eef1f (diff) | |
| parent | 4d569ed1a3305c7b7abe8fa4273cea3b559cc85a (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Conflicts:
BUGS
package/autoconf/Makefile
Diffstat (limited to 'package/gettext')
| -rw-r--r-- | package/gettext/Config.in | 6 | ||||
| -rw-r--r-- | package/gettext/Makefile | 14 |
2 files changed, 8 insertions, 12 deletions
diff --git a/package/gettext/Config.in b/package/gettext/Config.in deleted file mode 100644 index 86fd858bb..000000000 --- a/package/gettext/Config.in +++ /dev/null @@ -1,6 +0,0 @@ -config ADK_PACKAGE_GETTEXT - prompt "gettext........................... internationalisation library" - tristate - default n - help - GNU gettext diff --git a/package/gettext/Makefile b/package/gettext/Makefile index 04e1bf06c..4ef29852e 100644 --- a/package/gettext/Makefile +++ b/package/gettext/Makefile @@ -10,16 +10,20 @@ PKG_MD5SUM= 3d9ad24301c6d6b17ec30704a13fe127 PKG_DESCR:= internationalisation library PKG_SECTION:= libs PKG_DEPENDS:= libiconv libpthread +PKG_BUILDDEP+= libiconv libpthread PKG_URL:= http://www.gnu.org/software/gettext/ -PKG_SITES= ${MASTER_SITE_GNU:=gettext/} +PKG_SITES:= ${MASTER_SITE_GNU:=gettext/} + +ifeq ($(ADK_STATIC),y) +PKG_OPTS:= libonly +endif WRKDIST= ${WRKDIR}/${PKG_NAME}-${PKG_VERSION}/gettext-runtime include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,GETTEXT,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,GETTEXT,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) -CONFIGURE_STYLE= gnu CONFIGURE_ARGS+= --disable-java \ --disable-native-java \ --disable-csharp \ @@ -33,11 +37,9 @@ CONFIGURE_ARGS+= --disable-java \ CONFIGURE_ENV+= nls_cv_use_gnu_gettext=yes \ ac_cv_gnu_library_2=no \ gt_use_preinstalled_gnugettext=no -BUILD_STYLE= auto -INSTALL_STYLE= auto confprog post-install: ${INSTALL_DIR} ${IDIR_GETTEXT}/usr/lib - ${CP} ${WRKINST}/usr/lib/*.so.* ${IDIR_GETTEXT}/usr/lib + ${CP} ${WRKINST}/usr/lib/*.so* ${IDIR_GETTEXT}/usr/lib include ${TOPDIR}/mk/pkg-bottom.mk |