summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGunnar Wrobel <wrobel@pardus.de>2010-09-13 11:21:02 (GMT)
committerGunnar Wrobel <wrobel@pardus.de>2010-09-13 11:21:02 (GMT)
commitc7f24760d5043330a97d682db412f9f3155ac6be (patch)
tree78a66adc2a1e91b51c33a02fae5549341fb88811
parentd792ed29c7fe23e28d8c53fe72a66765744cb13b (diff)
downloadkolab-webadmin-c7f24760d5043330a97d682db412f9f3155ac6be.tar.gz
Remove dist_conf from the headers.php include.
-rw-r--r--Makefile.am12
-rw-r--r--php/admin/include/headers.php (renamed from php/admin/include/headers.php.in)2
2 files changed, 2 insertions, 12 deletions
diff --git a/Makefile.am b/Makefile.am
index ec47bc7..6c619f9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -107,17 +107,13 @@ PHP_INCLUDES = php/admin/include/menu.php \
php/admin/include/authenticate.php \
php/admin/include/debug.php \
php/admin/include/form.class.php \
+ php/admin/include/headers.php \
php/admin/include/ldap.class.php \
php/admin/include/locale.php \
php/admin/include/mysmarty.php \
php/admin/include/Sieve.php \
php/admin/include/passwd.php
-phpincludesdir = $(phpkolabdir)/include
-phpincludes_DATA = $(PHP_INCLUDES) \
- php/admin/include/headers.php
-EXTRA_DIST += $(PHP_INCLUDES)
-
PEARKA_FILES = lib/KolabAdmin/Ldap.php \
lib/KolabAdmin/Sieve.php
pearkadir = $(phplibdir)/KolabAdmin
@@ -379,12 +375,6 @@ CLEANFILES += www/admin/user/vacation.php
EXTRA_DIST += www/admin/user/vacation.php.in
###
-php/admin/include/headers.php: php/admin/include/headers.php.in
- @$(mkinstalldirs) php/admin/include
- $(do_subst) <$(srcdir)/php/admin/include/headers.php.in >$@
-CLEANFILES += php/admin/include/headers.php
-EXTRA_DIST += php/admin/include/headers.php.in
-
php/admin/templates/page.tpl: php/admin/templates/page.tpl.in
@$(mkinstalldirs) php/admin/templates
$(do_subst) <$(srcdir)/php/admin/templates/page.tpl.in >$@
diff --git a/php/admin/include/headers.php.in b/php/admin/include/headers.php
index c19f94d..2ddb5bf 100644
--- a/php/admin/include/headers.php.in
+++ b/php/admin/include/headers.php
@@ -23,7 +23,7 @@ header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT");
header("Cache-Control: no-cache, must-revalidate");
header("Pragma: no-cache");
-$topdir = '@kolab_wui@';
+$topdir = $params['kolab_wui'];
/*
Local variables:
mode: php