diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-01-10 11:03:58 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-01-10 11:03:58 +0100 |
| commit | 94c763109f74b446e4d5d31e55ef337c8c8d86cb (patch) | |
| tree | 22d1cd06809f5a5c11241e998d9ead4010ac3c91 /package/findutils/Makefile | |
| parent | a217fc80b29080dae963bb15051df023de36ce39 (diff) | |
| parent | 16d94117a716fc361d3db9a2a17cf4c45eab837d (diff) | |
resolve conflicts
Diffstat (limited to 'package/findutils/Makefile')
| -rw-r--r-- | package/findutils/Makefile | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/package/findutils/Makefile b/package/findutils/Makefile index d53312381..0f905d67b 100644 --- a/package/findutils/Makefile +++ b/package/findutils/Makefile @@ -13,17 +13,23 @@ PKG_DEPENDS:= libpthread PKG_URL:= http://www.gnu.org/software/findutils/ PKG_SITES:= http://ftp.gnu.org/pub/gnu/findutils/ +PKG_SUBPKGS:= FINDUTILS LOCATE +PKGSD_LOCATE:= Locate utility + include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,FINDUTILS,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,LOCATE,locate,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LOCATE},${PKG_SECTION})) CONFIGURE_ENV+= gl_cv_func_wcwidth_works=yes post-install: - $(INSTALL_DIR) $(IDIR_FINDUTILS)/usr/bin $(IDIR_FINDUTILS)/usr/libexec - $(INSTALL_BIN) $(WRKINST)/usr/bin/{find,locate,oldfind,updatedb,xargs} \ + $(INSTALL_DIR) $(IDIR_FINDUTILS)/usr/bin + $(INSTALL_BIN) $(WRKINST)/usr/bin/{find,oldfind,xargs} \ $(IDIR_FINDUTILS)/usr/bin + ${INSTALL_DIR} ${IDIR_LOCATE}/usr/{bin,libexec} + ${INSTALL_BIN} ${WRKINST}/usr/bin/{locate,updatedb} ${IDIR_LOCATE}/usr/bin/ $(INSTALL_BIN) $(WRKINST)/usr/libexec/{bigram,code,frcode} \ - $(IDIR_FINDUTILS)/usr/libexec + $(IDIR_LOCATE)/usr/libexec include ${TOPDIR}/mk/pkg-bottom.mk |