diff options
| author | Florent Thoumie <flz@FreeBSD.org> | 2006-01-13 15:57:51 +0000 |
|---|---|---|
| committer | Florent Thoumie <flz@FreeBSD.org> | 2006-01-13 15:57:51 +0000 |
| commit | e011792f19e68fb8525c98e8d7cb8f7245f5dc5e (patch) | |
| tree | 52c40916b0fc618903dcbb1e16de5b335502a358 /misc | |
| parent | - Update to 4.7 (diff) | |
- Fix issue when WITHOUT_X11 is defined.
Noticed by: mnag
Notes
Notes:
svn path=/head/; revision=153391
Diffstat (limited to 'misc')
| -rw-r--r-- | misc/ldconfig_compat/Makefile | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/misc/ldconfig_compat/Makefile b/misc/ldconfig_compat/Makefile index c568f02d76bf..20ee4e9bc6c0 100644 --- a/misc/ldconfig_compat/Makefile +++ b/misc/ldconfig_compat/Makefile @@ -7,7 +7,7 @@ PORTNAME= ldconfig_compat PORTVERSION= 1.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= misc MASTER_SITES= # none DISTFILES= # none @@ -25,6 +25,12 @@ LOCAL_DIRS= ${LDCONFIG_DIR} \ SUB_LIST= LDCONFIG_DIR=${LDCONFIG_DIR} \ LDCONFIG32_DIR=${LDCONFIG32_DIR} +.if !defined(WITHOUT_X11) +LOCAL_PREFIXES= ${PREFIX} ${X11BASE} +.else +LOCAL_PREFIXES= ${PREFIX} +.endif + .include <bsd.port.pre.mk> .include "${.CURDIR}/bsd.ldconfig.mk" @@ -47,11 +53,11 @@ do-install: @${INSTALL_SCRIPT} ${WRKDIR}/ldconfig_compat.sh ${PREFIX}/etc/rc.d/000.ldconfig_compat.sh @${ECHO_CMD} "etc/rc.d/000.ldconfig_compat.sh" >> ${TMPPLIST} .endif -.for prefix in ${PREFIX} ${X11BASE} +.for prefix in ${LOCAL_PREFIXES} @${ECHO_CMD} "@cwd ${prefix}" >> ${TMPPLIST} .for dir in ${LOCAL_DIRS} - @${MKDIR} ${prefix}/${dir} - @${ECHO_CMD} "@exec mkdir %D/${dir}" >> ${TMPPLIST} + @${MKDIR} -p ${prefix}/${dir} + @${ECHO_CMD} "@exec mkdir -p %D/${dir}" >> ${TMPPLIST} @${ECHO_CMD} "@unexec rmdir %D/${dir} 2>/dev/null || true" >> ${TMPPLIST} .endfor .endfor |