diff options
author | taca <taca@pkgsrc.org> | 2013-06-27 15:48:29 +0000 |
---|---|---|
committer | taca <taca@pkgsrc.org> | 2013-06-27 15:48:29 +0000 |
commit | 6032f0f8f4418b6fdd921ed32e665ccd9e3c8add (patch) | |
tree | 733582338e1e812305f358085f96b4efe611d1bd /www/contao | |
parent | 9459244cfc5599429ada28554fb9cf59331ef627 (diff) | |
download | pkgsrc-6032f0f8f4418b6fdd921ed32e665ccd9e3c8add.tar.gz |
* Make contao211 to use own FILESDIR.
* A small clean up to common/Makefile.common.
No functional change.
Diffstat (limited to 'www/contao')
-rw-r--r-- | www/contao/Makefile.common | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/www/contao/Makefile.common b/www/contao/Makefile.common index d49ef9547f6..dfa26bf5bab 100644 --- a/www/contao/Makefile.common +++ b/www/contao/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.35 2013/05/23 14:58:34 taca Exp $ +# $NetBSD: Makefile.common,v 1.36 2013/06/27 15:48:29 taca Exp $ # # used by www/contao/Makefile.example" # used by www/contao211/Makefile @@ -15,18 +15,24 @@ CT_VERS?= 211 .if ${CT_VERS} == "211" CT_VERSION= ${CT211_VERSION} -CT_FILES= tl_files .elif ${CT_VERS} == "30" CT_VERSION= ${CT300_VERSION} -CT_FILES= files -CT_DIST_SUBDIR= contao-20120109 .elif ${CT_VERS} == "31" CT_VERSION= ${CT310_VERSION} -CT_FILES= files .else .error "Illegal version specified: ${CT_VERS}" .endif +.if ${CT_VERS} == "211" +CT_FILES= tl_files +.else +. if ${CT_VERS} == "30" +CT_DIST_SUBDIR= contao-20120109 +. endif +CT_FILES= files +FILESDIR= ${.CURDIR}/../../www/contao/files +.endif + CT_VER= ${CT_VERSION:C/([0-9]+)\.([0-9]+)\..*/\1\2/} CT_VERBASE= ${CT_VERSION:C/([0-9]+)\.([0-9]+)\..*/\1.\2/} CT_PKGVER= ${CT_VERSION:S/.RC/rc/} @@ -56,5 +62,3 @@ CT_EGDIR?= share/examples/contao${CT_VER} CT_WEBDIR?= share/contao${CT_VER} BUILD_DEFS+= APACHE_USER CT_DOCDIR CT_EGDIR CT_WEBDIR - -FILESDIR= ${.CURDIR}/../../www/contao/files |