diff options
| author | Dirk Froemberg <dirk@FreeBSD.org> | 2002-05-11 16:49:32 +0000 |
|---|---|---|
| committer | Dirk Froemberg <dirk@FreeBSD.org> | 2002-05-11 16:49:32 +0000 |
| commit | 16e5eb080ce0608618faf0bf8b775e6c4d166bf1 (patch) | |
| tree | 331a6b822d1f26f6049c87dfd02202ffafb4ec31 | |
| parent | Remove stale PLIST_SUB for AP_LIBEXEC which wrongly overrode previous (diff) | |
- extension dir is no-debug-zts-20010901 if WITH_APACHE2 is set
- extension dir has to be created if installed as a package since it is
empty
- move PLIST_SUB into if-clause so it actually works
Submitted by: Alex Dupre <sysadmin@alexdupre.com>
| -rw-r--r-- | www/mod_php4/Makefile | 6 | ||||
| -rw-r--r-- | www/mod_php4/pkg-plist | 3 | ||||
| -rw-r--r-- | www/mod_php5/Makefile | 6 | ||||
| -rw-r--r-- | www/mod_php5/pkg-plist | 3 |
4 files changed, 12 insertions, 6 deletions
diff --git a/www/mod_php4/Makefile b/www/mod_php4/Makefile index 9b7c401f859c..bae9bf9669da 100644 --- a/www/mod_php4/Makefile +++ b/www/mod_php4/Makefile @@ -55,12 +55,14 @@ MAKE_ENV= STANDALONE="${STANDALONE}" .if defined(WITH_APACHE2) CONFIGURE_ARGS= --with-apxs2=${PREFIX}/sbin/apxs \ --with-tsrm-pth -PLIST_SUB= MOD_DIR=libexec/apache2 +PLIST_SUB= MOD_DIR=libexec/apache2 \ + NON= .else CONFIGURE_ARGS= --with-apxs=${PREFIX}/sbin/apxs +PLIST_SUB= MOD_DIR=libexec/apache \ + NON=non- .endif CONFIGURE_ARGS+=--with-config-file-path=${PREFIX}/etc -PLIST_SUB= MOD_DIR=libexec/apache .endif CONFIGURE_ARGS+=--enable-versioning \ diff --git a/www/mod_php4/pkg-plist b/www/mod_php4/pkg-plist index f0b897bbdbf1..c86cc458b445 100644 --- a/www/mod_php4/pkg-plist +++ b/www/mod_php4/pkg-plist @@ -270,6 +270,7 @@ lib/php/build/shtool @dirrm lib/php/Schedule @dirrm lib/php/XML @dirrm lib/php/build -@dirrm lib/php/extensions/no-debug-non-zts-20010901 +@dirrm lib/php/extensions/no-debug-%%NON%%zts-20010901 @dirrm lib/php/extensions @dirrm lib/php +@exec mkdir -p %D/lib/php/extensions/no-debug-%%NON%%zts-20010901 diff --git a/www/mod_php5/Makefile b/www/mod_php5/Makefile index 9b7c401f859c..bae9bf9669da 100644 --- a/www/mod_php5/Makefile +++ b/www/mod_php5/Makefile @@ -55,12 +55,14 @@ MAKE_ENV= STANDALONE="${STANDALONE}" .if defined(WITH_APACHE2) CONFIGURE_ARGS= --with-apxs2=${PREFIX}/sbin/apxs \ --with-tsrm-pth -PLIST_SUB= MOD_DIR=libexec/apache2 +PLIST_SUB= MOD_DIR=libexec/apache2 \ + NON= .else CONFIGURE_ARGS= --with-apxs=${PREFIX}/sbin/apxs +PLIST_SUB= MOD_DIR=libexec/apache \ + NON=non- .endif CONFIGURE_ARGS+=--with-config-file-path=${PREFIX}/etc -PLIST_SUB= MOD_DIR=libexec/apache .endif CONFIGURE_ARGS+=--enable-versioning \ diff --git a/www/mod_php5/pkg-plist b/www/mod_php5/pkg-plist index f0b897bbdbf1..c86cc458b445 100644 --- a/www/mod_php5/pkg-plist +++ b/www/mod_php5/pkg-plist @@ -270,6 +270,7 @@ lib/php/build/shtool @dirrm lib/php/Schedule @dirrm lib/php/XML @dirrm lib/php/build -@dirrm lib/php/extensions/no-debug-non-zts-20010901 +@dirrm lib/php/extensions/no-debug-%%NON%%zts-20010901 @dirrm lib/php/extensions @dirrm lib/php +@exec mkdir -p %D/lib/php/extensions/no-debug-%%NON%%zts-20010901 |