Attachment 46161 Details for Bug 70945 – Makefile.common.diff

[patch] Makefile.common.diff

Makefile.common.diff (text/plain), 4.82 KB, created by Antonio Carlos Venancio Junior on 2004-08-25 23:33:19 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Antonio Carlos Venancio Junior

Created: 2004-08-25 23:33:19 UTC

Size: 4.82 KB

patch

obsolete

>--- Makefile.common.orig	Tue Aug 24 16:00:30 2004
>+++ Makefile.common	Wed Aug 25 18:47:38 2004
>@@ -21,11 +21,15 @@
> LDOCSDIR=	share/doc/pear/${PORTNAME}
> LEXAMPLESDIR=	share/examples/pear/${PORTNAME}
> LTESTSDIR=	${LPEARDIR}/tests/${PORTNAME}
>+LDATADIR=	${LPEARDIR}/data/${PORTNAME}
>+LSQLSDIR=	${LPEARDIR}/sql/${PORTNAME}
> PEARDIR=	${PHP_BASE}/${LPEARDIR}
> PKGREGDIR=	${PHP_BASE}/${LPKGREGDIR}
> DOCSDIR=	${PHP_BASE}/${LDOCSDIR}
> EXAMPLESDIR=	${PHP_BASE}/${LEXAMPLESDIR}
> TESTSDIR=	${PHP_BASE}/${LTESTSDIR}
>+DATADIR=	${PHP_BASE}/${LDATADIR}
>+SQLSDIR=	${PHP_BASE}/${LSQLSDIR}
> .if defined(CATEGORY) && !empty(CATEGORY)
> LINSTDIR=	${LPEARDIR}/${CATEGORY}
> .else
>@@ -38,7 +42,8 @@
> .endif
> PLIST_SUB=	PEARDIR=${LPEARDIR} PKGREGDIR=${LPKGREGDIR} \
> 		TESTSDIR=${LTESTSDIR} EXAMPLESDIR=${LEXAMPLESDIR} \
>-		INSTDIR=${LINSTDIR}
>+		INSTDIR=${LINSTDIR} SQLSDIR=${LSQLSDIR} \
>+		DATADIR=${LDATADIR}
> 
> PKGINSTALL=	${PORTSDIR}/devel/pear-PEAR/pkg-install
> PKGDEINSTALL=	${PORTSDIR}/devel/pear-PEAR/pkg-deinstall
>@@ -46,15 +51,19 @@
> FILES?=
> DOCS?=
> TESTS?=
>+DATA?=
>+SQLS?=
> EXAMPLES?=
> _TESTSDIR?=	tests
>+_DATADIR?=	data
>+_SQLSDIR?=	sql
> _DOCSDIR?=	docs
> _EXAMPLESDIR?=	examples
> 
> # this is an easy way to eliminate duplicate entries in a variable :)
> # if someone knows how to achieve the result without this terrible
> # hack, please tell me!
>-.for v in FILES DOCS TESTS EXAMPLES
>+.for v in FILES DOCS TESTS EXAMPLES SQLS DATA
> X${v}DIRS=	${${v}:M*/*:C;/[^/]+$;;}
> . for XD in ${X${v}DIRS}
> ALREADYTHERE=	0
>@@ -90,6 +99,8 @@
> 	@${ECHO_MSG} "===>   Generating packing list"; \
> 	(for file in ${FILES}; do echo "${LINSTDIR}/$${file}"; done; \
> 	for file in ${TESTS}; do echo "${LTESTSDIR}/$${file}"; done; \
>+	for file in ${DATA}; do echo "${LDATADIR}/$${file}"; done; \
>+	for file in ${SQLS}; do echo "${LSQLSDIR}/$${file}"; done; \
> 	for file in ${DOCS}; do echo "%%PORTDOCS%%${LDOCSDIR}/$${file}"; done; \
> 	for file in ${EXAMPLES}; do echo "%%PORTDOCS%%${LEXAMPLESDIR}/$${file}"; done; \
> 	echo "${LPKGREGDIR}/package.xml"; \
>@@ -97,11 +108,17 @@
> 	    while read dir; do echo "@dirrm ${LINSTDIR}/$${dir}"; done; \
> 	for d in ${TESTS}; do echo $${d}; done | ${DIRFILTER} | \
> 	    while read dir; do echo "@dirrm ${LTESTSDIR}/$${dir}"; done; \
>+	for d in ${DATA}; do echo $${d}; done | ${DIRFILTER} | \
>+	    while read dir; do echo "@dirrm ${LDATADIR}/$${dir}"; done; \
>+	for d in ${SQLS}; do echo $${d}; done | ${DIRFILTER} | \
>+	    while read dir; do echo "@dirrm ${LSQLSDIR}/$${dir}"; done; \
> 	for d in ${DOCS}; do echo $${d}; done | ${DIRFILTER} | \
> 	    while read dir; do echo "%%PORTDOCS%%@dirrm ${LDOCSDIR}/$${dir}"; done; \
> 	for d in ${EXAMPLES}; do echo $${d}; done | ${DIRFILTER} | \
> 	    while read dir; do echo "%%PORTDOCS%%@dirrm ${LEXAMPLESDIR}/$${dir}"; done; \
> 	if [ -n "${TESTS}" ]; then echo "@dirrm ${LTESTSDIR}"; fi; \
>+	if [ -n "${DATA}" ]; then echo "@dirrm ${LDATADIR}"; fi; \
>+	if [ -n "${SQLS}" ]; then echo "@dirrm ${LSQLSDIR}"; fi; \
> 	if [ -n "${DOCS}" ]; then echo "%%PORTDOCS%%@dirrm ${LDOCSDIR}"; fi; \
> 	if [ -n "${EXAMPLES}" ]; then echo "%%PORTDOCS%%@dirrm ${LEXAMPLESDIR}"; fi; \
> 	echo "@dirrm ${LPKGREGDIR}"; \
>@@ -111,17 +128,20 @@
> 	echo "@unexec rmdir %D/${LPEARDIR} 2> /dev/null || true"; \
> 	echo "@unexec rmdir %D/${LDOCSDIR:H} 2> /dev/null || true"; \
> 	echo "@unexec rmdir %D/${LEXAMPLESDIR:H} 2> /dev/null || true"; \
>-	echo "@unexec rmdir %D/${LTESTSDIR:H} 2> /dev/null || true") > ${PLIST}
>+	echo "@unexec rmdir %D/${LTESTSDIR:H} 2> /dev/null || true"; \
>+	echo "@unexec rmdir %D/${LDATADIR:H} 2> /dev/null || true"; \
>+	echo "@unexec rmdir %D/${LSQLSDIR:H} 2> /dev/null || true") > ${PLIST}
> . endif
> 
>-. for t in files docs tests examples
>+. for t in files docs tests sqls examples data
> .  if !target(do-install-${t}-msg)
> do-install-${t}-msg: .USE
> .  endif
> . endfor
> 
>-pre-install: do-generate-plist
>-do-install: do-install-files do-install-docs do-install-tests do-install-examples
>+pre-install: 	do-generate-plist
>+do-install: 	do-install-files do-install-docs do-install-tests do-install-sqls \
>+		do-install-examples do-install-data
> 
> do-install-files: do-install-files-msg
> 	@${MKDIR} ${INSTDIR}
>@@ -153,6 +173,30 @@
> .  endfor
> .  for file in ${TESTS}
> 	@${INSTALL_DATA} ${WRKSRC}/${_TESTSDIR}/${file} ${TESTSDIR}/${file}
>+.  endfor
>+. endif
>+
>+do-install-data: do-install-data-msg
>+. if !empty(DATA)
>+	@${ECHO_MSG} "===> Installing data in ${DATADIR}."
>+	@${MKDIR} ${DATADIR}
>+.  for dir in ${DATADIRS}
>+	@${MKDIR} ${DATADIR}/${dir}
>+.  endfor
>+.  for file in ${DATA}
>+	@${INSTALL_DATA} ${WRKSRC}/${_DATADIR}/${file} ${DATADIR}/${file}
>+.  endfor
>+. endif
>+
>+do-install-sqls: do-install-sqls-msg
>+. if !empty(SQLS)
>+	@${ECHO_MSG} "===> Installing sqls in ${SQLSDIR}."
>+	@${MKDIR} ${SQLSDIR}
>+.  for dir in ${SQLSDIRS}
>+	@${MKDIR} ${SQLSDIR}/${dir}
>+.  endfor
>+.  for file in ${SQLS}
>+	@${INSTALL_DATA} ${WRKSRC}/${_SQLSDIR}/${file} ${SQLSDIR}/${file}
> .  endfor
> . endif
>

Actions: View | Diff

Attachments on bug 70945: 46160 | 46161 | 46162 | 46163