diff options
author | wbx <wbx@openadk.org> | 2011-04-12 19:22:32 +0200 |
---|---|---|
committer | wbx <wbx@openadk.org> | 2011-04-12 19:22:32 +0200 |
commit | 933e74c07231e815bbfd9ed90073308eaf253a00 (patch) | |
tree | f1733a1feb58ecf8f2d51eb9585edd2ee23f648b /package/gettext | |
parent | 0c8fa8e61a481d2d25c55e20c0ebd5176375e623 (diff) | |
parent | 819692c26044aa5bb280a08fa017de9d55ca18b9 (diff) |
resolve merge conflict
Diffstat (limited to 'package/gettext')
-rw-r--r-- | package/gettext/Makefile | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/package/gettext/Makefile b/package/gettext/Makefile index 665115d06..14d502958 100644 --- a/package/gettext/Makefile +++ b/package/gettext/Makefile @@ -52,24 +52,24 @@ CONFIGURE_ENV+= nls_cv_use_gnu_gettext=yes \ INSTALL_STYLE:= manual -libintl-install: +post-build: + ${INSTALL_DIR} ${STAGING_DIR}/usr/include ${STAGING_DIR}/usr/lib + $(CP) $(WRKBUILD)/gettext-runtime/intl/libintl.h ${STAGING_DIR}/usr/include + ${CP} ${WRKBUILD}/gettext-runtime/intl/.libs/libintl.so* \ + ${STAGING_DIR}/usr/lib + +post-install: ${INSTALL_DIR} ${IDIR_LIBINTL}/usr/lib ${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-tools/src/.libs/xgettext \ $(IDIR_GETTEXT)/usr/bin $(INSTALL_BIN) $(WRKBUILD)/gettext-runtime/src/.libs/gettext \ $(IDIR_GETTEXT)/usr/bin - -msgfmt-install: ${INSTALL_DIR} ${IDIR_MSGFMT}/usr/bin ${INSTALL_DIR} ${IDIR_MSGFMT}/usr/lib ${CP} ${WRKBUILD}/gettext-tools/libgettextpo/.libs/libgettextpo.so* \ |