Browse Source

acoid libtool relink, because it fails.

Waldemar Brodkorb 14 years ago
parent
commit
9ac3310d52
1 changed files with 10 additions and 4 deletions
  1. 10 4
      package/gettext/Makefile

+ 10 - 4
package/gettext/Makefile

@@ -47,22 +47,28 @@ CONFIGURE_ENV+=		nls_cv_use_gnu_gettext=yes \
 			ac_cv_gnu_library_2=no \
 			ac_cv_gnu_library_2=no \
 			gt_use_preinstalled_gnugettext=no
 			gt_use_preinstalled_gnugettext=no
 
 
+INSTALL_STYLE:=		manual
+
 libintl-install:
 libintl-install:
 	${INSTALL_DIR} ${IDIR_LIBINTL}/usr/lib
 	${INSTALL_DIR} ${IDIR_LIBINTL}/usr/lib
-	${CP} ${WRKINST}/usr/lib/libintl.so* \
+	${CP} ${WRKBUILD}/gettext-runtime/intl/.libs/libintl.so* \
 		${IDIR_LIBINTL}/usr/lib
 		${IDIR_LIBINTL}/usr/lib
 
 
 gettext-install:
 gettext-install:
 	${INSTALL_DIR} ${IDIR_GETTEXT}/usr/bin
 	${INSTALL_DIR} ${IDIR_GETTEXT}/usr/bin
-	$(INSTALL_BIN) $(WRKINST)/usr/bin/gettext \
+	$(INSTALL_BIN) $(WRKBUILD)/gettext-runtime/src/.libs/gettext \
 		$(IDIR_GETTEXT)/usr/bin
 		$(IDIR_GETTEXT)/usr/bin
 
 
 msgfmt-install:
 msgfmt-install:
 	${INSTALL_DIR} ${IDIR_MSGFMT}/usr/bin
 	${INSTALL_DIR} ${IDIR_MSGFMT}/usr/bin
 	${INSTALL_DIR} ${IDIR_MSGFMT}/usr/lib
 	${INSTALL_DIR} ${IDIR_MSGFMT}/usr/lib
-	${CP} ${WRKINST}/usr/lib/libgettext*so* \
+	${CP} ${WRKBUILD}/gettext-tools/libgettextpo/.libs/libgettextpo.so* \
+		${IDIR_MSGFMT}/usr/lib
+	${CP} ${WRKBUILD}/gettext-tools/gnulib-lib/.libs/libgettextlib*so* \
+		${IDIR_MSGFMT}/usr/lib
+	${CP} ${WRKBUILD}/gettext-tools/src/.libs/libgettextsrc*so* \
 		${IDIR_MSGFMT}/usr/lib
 		${IDIR_MSGFMT}/usr/lib
-	$(INSTALL_BIN) $(WRKINST)/usr/bin/msgfmt \
+	$(INSTALL_BIN) $(WRKBUILD)/gettext-tools/src/.libs/msgfmt \
 		$(IDIR_MSGFMT)/usr/bin
 		$(IDIR_MSGFMT)/usr/bin
 
 
 include ${TOPDIR}/mk/pkg-bottom.mk
 include ${TOPDIR}/mk/pkg-bottom.mk