diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-02-24 17:44:13 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-02-24 17:44:13 +0100 |
| commit | 67cb0759e674470fa53fd3711d8460fd4a12c1a3 (patch) | |
| tree | b1f075ce06512879f327e1aa3abc3838b2de0539 /package/gettext | |
| parent | 0aabef127155575e8c8d660605f9401ab15356aa (diff) | |
| parent | 87832fb8da02431280c0a1f9c127dd121ddb7b25 (diff) | |
resolve conflict
Diffstat (limited to 'package/gettext')
| -rw-r--r-- | package/gettext/Makefile | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/package/gettext/Makefile b/package/gettext/Makefile index 8cafe4ebc..55723a49b 100644 --- a/package/gettext/Makefile +++ b/package/gettext/Makefile @@ -14,7 +14,9 @@ PKG_DEPENDS:= libiconv libpthread PKG_URL:= http://www.gnu.org/software/gettext/ PKG_SITES:= ${MASTER_SITE_GNU:=gettext/} -PKG_SUBPKGS:= LIBINTL GETTEXT MSGFMT +PKG_SUBPKGS:= LIBINTL LIBINTL_DEV GETTEXT MSGFMT +PKGSD_LIBINTL_DEV:= libintl headers +PKGSC_LIBINTL_DEV:= devel PKGSD_GETTEXT:= gettext utility PKGSC_GETTEXT:= misc PKGSS_GETTEXT:= libintl @@ -29,6 +31,7 @@ endif include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,LIBINTL,libintl,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) +$(eval $(call PKG_template,LIBINTL_DEV,libintl-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBINTL_DEV},${PKGSC_LIBINTL_DEV},${PKG_OPTS})) $(eval $(call PKG_template,GETTEXT,gettext,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_GETTEXT},${PKGSD_GETTEXT},${PKGSC_GETTEXT})) $(eval $(call PKG_template,MSGFMT,msgfmt,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_MSGFMT},${PKGSD_MSGFMT},${PKGSC_MSGFMT})) @@ -54,6 +57,11 @@ libintl-install: ${CP} ${WRKBUILD}/gettext-runtime/intl/.libs/libintl.so* \ ${IDIR_LIBINTL}/usr/lib +libintl-dev-install: + ${INSTALL_DIR} ${IDIR_LIBINTL_DEV}/usr/include + ${INSTALL_DATA} ${WRKBUILD}/gettext-runtime/intl/libintl.h \ + ${IDIR_LIBINTL_DEV}/usr/include + gettext-install: ${INSTALL_DIR} ${IDIR_GETTEXT}/usr/bin $(INSTALL_BIN) $(WRKBUILD)/gettext-runtime/src/.libs/gettext \ |