diff options
| author | Pav Lucistnik <pav@FreeBSD.org> | 2009-02-12 16:46:23 +0000 |
|---|---|---|
| committer | Pav Lucistnik <pav@FreeBSD.org> | 2009-02-12 16:46:23 +0000 |
| commit | af13aa1d5ade82c77983431447fe548a4a2a8b03 (patch) | |
| tree | 67d9a52057aeec6fe5dea083c10d121698bcf41e /misc | |
| parent | 7ada5affed049fa6c975d47ea65bb3fd4e834e2f (diff) | |
- Simplify ldconfig handling
Notes
Notes:
svn path=/head/; revision=228123
Diffstat (limited to 'misc')
| -rw-r--r-- | misc/compat4x/Makefile | 14 | ||||
| -rw-r--r-- | misc/compat5x/Makefile | 11 | ||||
| -rw-r--r-- | misc/compat6x/Makefile | 10 |
3 files changed, 3 insertions, 32 deletions
diff --git a/misc/compat4x/Makefile b/misc/compat4x/Makefile index 8ebba6459b5f..1dcafed20930 100644 --- a/misc/compat4x/Makefile +++ b/misc/compat4x/Makefile @@ -23,12 +23,9 @@ RUN_DEPENDS= ${LOCALBASE}/share/compat/locale/UTF-8/LC_CTYPE:${PORTSDIR}/misc/lo WRKSRC= ${WRKDIR}/usr/lib/compat NO_BUILD= yes -USE_LDCONFIG= yes -LDCONFIG_DIRS= %%PREFIX%%/lib/compat TARGET_DIR= ${PREFIX}/lib/compat TARGET32_DIR= ${PREFIX}/lib32/compat LDCONFIG_LIB32= ${LDCONFIG} -32 -USE_LDCONFIG= ${TARGET_DIR} .include <bsd.port.pre.mk> @@ -63,9 +60,8 @@ PLIST_SUB+= I386_ONLY="@comment " PLIST_SUB+= AMD64_ONLY="" AMD64NA="@comment " PLIST_SUB+= LDCONFIG_LIB32="${LDCONFIG} -32" USE_LDCONFIG32= ${TARGET32_DIR} -.undef USE_LDCONFIG -USE_LDCONFIG= no .else +USE_LDCONFIG= ${TARGET_DIR} PLIST_SUB+= AMD64_ONLY="@comment " AMD64NA="" .endif @@ -109,13 +105,7 @@ do-install: ${LN} -sf ${lib}.compat4x ${TARGET_DIR}/${lib} .endfor -# Include to automatic install file in libdata/ldconfig{,32} -.include "${PORTSDIR}/misc/ldconfig_compat/bsd.ldconfig.mk" - -post-install: install-ldconfig-file -.if ${ARCH} == amd64 - ${LDCONFIG} -32 -m ${TARGET32_DIR} -.endif +post-install: @${CAT} ${PKGMESSAGE} pre-clean: diff --git a/misc/compat5x/Makefile b/misc/compat5x/Makefile index c44647d98bde..255fc521bf57 100644 --- a/misc/compat5x/Makefile +++ b/misc/compat5x/Makefile @@ -28,8 +28,6 @@ WRKSRC= ${WRKDIR}/${PORTNAME} USE_BZIP2= yes NO_BUILD= yes ONLY_FOR_ARCHS= alpha amd64 i386 sparc64 -USE_LDCONFIG= yes -LDCONFIG_DIRS= %%PREFIX%%/lib/compat TARGET_DIR= ${PREFIX}/lib/compat TARGET32_DIR= ${PREFIX}/lib32/compat USE_LDCONFIG= ${TARGET_DIR} @@ -75,13 +73,4 @@ do-install: (cd ${WRKSRC}/lib32 && ${INSTALL_DATA} *.so.* ${TARGET32_DIR}) .endif -# Include to automatic install file in libdata/ldconfig{,32} -.include "${PORTSDIR}/misc/ldconfig_compat/bsd.ldconfig.mk" - -post-install: install-ldconfig-file -.if ${ARCH} == amd64 - @${LDCONFIG} -32 -m ${TARGET32_DIR} -.endif - @${CAT} ${PKGMESSAGE} - .include <bsd.port.post.mk> diff --git a/misc/compat6x/Makefile b/misc/compat6x/Makefile index 2f59ccbf79f5..e24051342eb7 100644 --- a/misc/compat6x/Makefile +++ b/misc/compat6x/Makefile @@ -21,8 +21,6 @@ USE_BZIP2= yes NO_BUILD= yes ONLY_FOR_ARCHS= i386 amd64 alpha sparc64 PLIST= ${PKGDIR}/pkg-plist.${ARCH} -USE_LDCONFIG= yes -LDCONFIG_DIRS= %%PREFIX%%/lib/compat TARGET_DIR= ${PREFIX}/lib/compat TARGET32_DIR= ${PREFIX}/lib32/compat USE_LDCONFIG= ${TARGET_DIR} @@ -46,13 +44,7 @@ do-install: (cd ${WRKSRC}/lib32 && ${INSTALL_DATA} *.so.* ${TARGET32_DIR}) .endif -# Include this file to use install-ldconfig-file -.include "${PORTSDIR}/misc/ldconfig_compat/bsd.ldconfig.mk" - -post-install: install-ldconfig-file -.if ${ARCH} == amd64 - @${LDCONFIG} -32 -m ${TARGET32_DIR} -.endif +post-install: @${CAT} ${PKGMESSAGE} .include <bsd.port.post.mk> |