richard: server/kolab-webadmin/kolab-webadmin ChangeLog, 1.19, 1.20 Makefile.am, 1.33, 1.34
cvs at intevation.de
cvs at intevation.de
Sun Feb 5 21:13:57 CET 2006
Author: richard
Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin
In directory doto:/tmp/cvs-serv13443
Modified Files:
ChangeLog Makefile.am
Log Message:
Use the new kolab_php_module_prefix variable
Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/ChangeLog,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- ChangeLog 18 Jan 2006 19:35:17 -0000 1.19
+++ ChangeLog 5 Feb 2006 20:13:55 -0000 1.20
@@ -1,3 +1,38 @@
+2006-02-05 Richard Bos <richard at radoeka.nl>
+ * www/admin/addressbook/addr.php, www/admin/addressbook/index.php,
+ www/admin/administrator/admin.php, www/admin/administrator/index.php,
+ www/admin/distributionlist/index.php,
+ www/admin/distributionlist/list.php,
+ www/admin/domainmaintainer/domainmaintainer.php,
+ www/admin/domainmaintainer/index.php, www/admin/index.php,
+ www/admin/kolab/codefusion.php, www/admin/kolab/erfrakon.php,
+ www/admin/kolab/index.php, www/admin/kolab/intevation.php,
+ www/admin/kolab/kdab.php, www/admin/kolab/kde.php,
+ www/admin/maintainer/index.php, www/admin/maintainer/maintainer.php,
+ www/admin/service/index.php, www/admin/sharedfolder/index.php,
+ www/admin/sharedfolder/sf.php, www/admin/user/deliver.php,
+ www/admin/user/forward.php, www/admin/user/index.php,
+ www/admin/user/vacation.php, php/admin/include/mysmarty.php: removed
+ * www/admin/addressbook/addr.php.in, www/admin/addressbook/index.php.in,
+ www/admin/administrator/admin.php.in,
+ www/admin/administrator/index.php.in,
+ www/admin/distributionlist/index.php.in,
+ www/admin/distributionlist/list.php.in,
+ www/admin/domainmaintainer/domainmaintainer.php.in,
+ www/admin/domainmaintainer/index.php.in, www/admin/index.php.in,
+ www/admin/kolab/codefusion.php.in, www/admin/kolab/erfrakon.php.in,
+ www/admin/kolab/index.php.in, www/admin/kolab/intevation.php.in,
+ www/admin/kolab/kdab.php.in, www/admin/kolab/kde.php.in,
+ www/admin/maintainer/index.php.in,
+ www/admin/maintainer/maintainer.php.in,
+ www/admin/service/index.php.in, www/admin/sharedfolder/index.php.in,
+ www/admin/sharedfolder/sf.php.in, www/admin/user/deliver.php.in,
+ www/admin/user/forward.php.in, www/admin/user/index.php.in,
+ www/admin/user/vacation.php.in,
+ php/admin/include/mysmarty.php.in: added. Use the new build
+ variable: kolab_php_module_prefix variable.
+ * Makefile.am: reflect the changes in the above mentioned files.
+
2006-01-17 Richard Bos <richard at radoeka.nl>
* Makefile.am: corrected make rule for php/admin/templates/versions.tpl
Index: Makefile.am
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/Makefile.am,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- Makefile.am 18 Jan 2006 19:35:17 -0000 1.33
+++ Makefile.am 5 Feb 2006 20:13:55 -0000 1.34
@@ -19,49 +19,49 @@
www/admin/style.css
wskolabdir = $(webserver_document_root)$(webserver_web_prefix)/admin
-dist_wskolab_DATA = $(WSKOLAB_FILES)
+wskolab_DATA = $(WSKOLAB_FILES)
+EXTRA_DIST += www/admin/style.css
WSADDRESSBOOK_FILES = www/admin/addressbook/addr.php \
www/admin/addressbook/index.php
wsaddressbookdir = $(wskolabdir)/addressbook
-dist_wsaddressbook_DATA = $(WSADDRESSBOOK_FILES)
+wsaddressbook_DATA = $(WSADDRESSBOOK_FILES)
WSADMINISTRATOR_FILES = www/admin/administrator/admin.php \
www/admin/administrator/index.php
wsadminstratordir = $(wskolabdir)/administrator
-dist_wsadminstrator_DATA = $(WSADMINISTRATOR_FILES)
+wsadminstrator_DATA = $(WSADMINISTRATOR_FILES)
WSDISTRIBUTIONLIST_FILES = www/admin/distributionlist/index.php \
www/admin/distributionlist/list.php
wsdistributionlistdir = $(wskolabdir)/distributionlist
-dist_wsdistributionlist_DATA = $(WSDISTRIBUTIONLIST_FILES)
+wsdistributionlist_DATA = $(WSDISTRIBUTIONLIST_FILES)
WSABOUT_FILES = www/admin/kolab/erfrakon.php \
www/admin/kolab/index.php \
www/admin/kolab/intevation.php \
www/admin/kolab/codefusion.php \
www/admin/kolab/kdab.php \
- www/admin/kolab/kde.php
+ www/admin/kolab/kde.php \
+ www/admin/kolab/versions.php
wsaboutdir = $(wskolabdir)/kolab
-wsabout_DATA = $(WSABOUT_FILES) \
- www/admin/kolab/versions.php
-EXTRA_DIST += $(WSABOUT_FILES)
+wsabout_DATA = $(WSABOUT_FILES)
WSMAINTAINER_FILES = www/admin/maintainer/maintainer.php \
www/admin/maintainer/index.php
wsmaintainerdir = $(wskolabdir)/maintainer
-dist_wsmaintainer_DATA = $(WSMAINTAINER_FILES)
+wsmaintainer_DATA = $(WSMAINTAINER_FILES)
WSDOMAINMAINTAINER_FILES = www/admin/domainmaintainer/domainmaintainer.php \
www/admin/domainmaintainer/index.php
wsdomainmaintainerdir = $(wskolabdir)/domainmaintainer
-dist_wsdomainmaintainer_DATA = $(WSDOMAINMAINTAINER_FILES)
+wsdomainmaintainer_DATA = $(WSDOMAINMAINTAINER_FILES)
WSPICS_FILES = www/admin/pics/erfrakon.png \
www/admin/pics/codefusion.png \
@@ -74,13 +74,13 @@
dist_wspics_DATA = $(WSPICS_FILES)
wsservicedir = $(wskolabdir)/service
-dist_wsservice_DATA = www/admin/service/index.php
+wsservice_DATA = www/admin/service/index.php
WSSHAREDFOLDER_FILES = www/admin/sharedfolder/sf.php \
www/admin/sharedfolder/index.php
wssharedfolderdir = $(wskolabdir)/sharedfolder
-dist_wssharedfolder_DATA = $(WSSHAREDFOLDER_FILES)
+wssharedfolder_DATA = $(WSSHAREDFOLDER_FILES)
WSUSER_FILES = www/admin/user/forward.php \
www/admin/user/index.php \
@@ -89,16 +89,9 @@
www/admin/user/deliver.php
wsuserdir = $(wskolabdir)/user
-dist_wsuser_DATA = $(WSUSER_FILES)
-
-phpkolabdir = $(phplibdir2)/admin
-
-php/admin/include/config.php: Makefile php/admin/include/config.php.in
- $(mkinstalldirs) php/admin/include
- $(do_subst) <$(srcdir)/php/admin/include/config.php.in >$@
+wsuser_DATA = $(WSUSER_FILES)
-CLEANFILES += php/admin/include/config.php
-EXTRA_DIST += php/admin/include/config.php.in
+phpkolabdir = $(phplibdir2)/$(kolab_php_module_prefix)admin
php_includes_configdir = $(phpkolabdir)/include
php_includes_config_DATA = php/admin/include/config.php
@@ -106,17 +99,18 @@
PHP_INCLUDES = php/admin/include/menu.php \
php/admin/include/debug.php \
php/admin/include/form.class.php \
- php/admin/include/auth.class.php \
php/admin/include/ldap.class.php \
php/admin/include/sieveutils.class.php \
- php/admin/include/mysmarty.php \
- php/admin/include/headers.php \
php/admin/include/authenticate.php \
php/admin/include/locale.php \
php/admin/include/Sieve.php
phpincludesdir = $(phpkolabdir)/include
-dist_phpincludes_DATA = $(PHP_INCLUDES)
+phpincludes_DATA = $(PHP_INCLUDES) \
+ php/admin/include/auth.class.php \
+ php/admin/include/headers.php \
+ php/admin/include/mysmarty.php
+EXTRA_DIST += $(PHP_INCLUDES)
PHP_TEMPLATES = php/admin/templates/maintainerdeleted.tpl \
php/admin/templates/kde.tpl \
@@ -202,17 +196,176 @@
dist_conf/mandriva \
dist_conf/suse
+### new
+
+www/admin/addressbook/addr.php:
+ @$(mkinstalldirs) www/admin/addressbook
+ $(do_subst) <$(srcdir)/www/admin/addressbook/addr.php.in >$@
+CLEANFILES += www/admin/addressbook/addr.php
+EXTRA_DIST += www/admin/addressbook/addr.php.in
+
+www/admin/addressbook/index.php:
+ @$(mkinstalldirs) www/admin/addressbook
+ $(do_subst) <$(srcdir)/www/admin/addressbook/index.php.in >$@
+CLEANFILES += www/admin/addressbook/index.php
+EXTRA_DIST += www/admin/addressbook/index.php.in
+
+www/admin/administrator/admin.php:
+ @$(mkinstalldirs) www/admin/administrator
+ $(do_subst) <$(srcdir)/www/admin/administrator/admin.php.in >$@
+CLEANFILES += www/admin/administrator/admin.php
+EXTRA_DIST += www/admin/administrator/admin.php.in
+
+www/admin/administrator/index.php:
+ @$(mkinstalldirs) www/admin/administrator
+ $(do_subst) <$(srcdir)/www/admin/administrator/index.php.in >$@
+CLEANFILES += www/admin/administrator/index.php
+EXTRA_DIST += www/admin/administrator/index.php.in
+
+www/admin/distributionlist/index.php:
+ @$(mkinstalldirs) www/admin/distributionlist
+ $(do_subst) <$(srcdir)/www/admin/distributionlist/index.php.in >$@
+CLEANFILES += www/admin/distributionlist/index.php
+EXTRA_DIST += www/admin/distributionlist/index.php.in
+
+www/admin/distributionlist/list.php:
+ @$(mkinstalldirs) www/admin/distributionlist
+ $(do_subst) <$(srcdir)/www/admin/distributionlist/list.php.in >$@
+CLEANFILES += www/admin/distributionlist/list.php
+EXTRA_DIST += www/admin/distributionlist/list.php.in
+
+www/admin/domainmaintainer/domainmaintainer.php:
+ @$(mkinstalldirs) www/admin/domainmaintainer
+ $(do_subst) <$(srcdir)/www/admin/domainmaintainer/domainmaintainer.php.in >$@
+CLEANFILES += www/admin/domainmaintainer/domainmaintainer.php
+EXTRA_DIST += www/admin/domainmaintainer/domainmaintainer.php.in
+
+www/admin/domainmaintainer/index.php:
+ @$(mkinstalldirs) www/admin/domainmaintainer
+ $(do_subst) <$(srcdir)/www/admin/domainmaintainer/index.php.in >$@
+CLEANFILES += www/admin/domainmaintainer/index.php
+EXTRA_DIST += www/admin/domainmaintainer/index.php.in
+
+www/admin/index.php:
+ @$(mkinstalldirs) www/admin
+ $(do_subst) <$(srcdir)/www/admin/index.php.in >$@
+CLEANFILES += www/admin/index.php
+EXTRA_DIST += www/admin/index.php.in
+
+www/admin/kolab/codefusion.php:
+ @$(mkinstalldirs) www/admin/kolab
+ $(do_subst) <$(srcdir)/www/admin/kolab/codefusion.php.in >$@
+CLEANFILES += www/admin/kolab/codefusion.php
+EXTRA_DIST += www/admin/kolab/codefusion.php.in
+
+www/admin/kolab/erfrakon.php:
+ @$(mkinstalldirs) www/admin/kolab
+ $(do_subst) <$(srcdir)/www/admin/kolab/erfrakon.php.in >$@
+CLEANFILES += www/admin/kolab/erfrakon.php
+EXTRA_DIST += www/admin/kolab/erfrakon.php.in
+
+www/admin/kolab/index.php:
+ @$(mkinstalldirs) www/admin/kolab
+ $(do_subst) <$(srcdir)/www/admin/kolab/index.php.in >$@
+CLEANFILES += www/admin/kolab/index.php
+EXTRA_DIST += www/admin/kolab/index.php.in
+
+www/admin/kolab/intevation.php:
+ @$(mkinstalldirs) www/admin/kolab
+ $(do_subst) <$(srcdir)/www/admin/kolab/intevation.php.in >$@
+CLEANFILES += www/admin/kolab/intevation.php
+EXTRA_DIST += www/admin/kolab/intevation.php.in
+
+www/admin/kolab/kdab.php:
+ @$(mkinstalldirs) www/admin/kolab
+ $(do_subst) <$(srcdir)/www/admin/kolab/kdab.php.in >$@
+CLEANFILES += www/admin/kolab/kdab.php
+EXTRA_DIST += www/admin/kolab/kdab.php.in
+
+www/admin/kolab/kde.php:
+ @$(mkinstalldirs) www/admin/kolab
+ $(do_subst) <$(srcdir)/www/admin/kolab/kde.php.in >$@
+CLEANFILES += www/admin/kolab/kde.php
+EXTRA_DIST += www/admin/kolab/kde.php.in
+
+www/admin/maintainer/index.php:
+ @$(mkinstalldirs) www/admin/maintainer
+ $(do_subst) <$(srcdir)/www/admin/maintainer/index.php.in >$@
+CLEANFILES += www/admin/maintainer/index.php
+EXTRA_DIST += www/admin/maintainer/index.php.in
+
+www/admin/maintainer/maintainer.php:
+ @$(mkinstalldirs) www/admin/maintainer
+ $(do_subst) <$(srcdir)/www/admin/maintainer/maintainer.php.in >$@
+CLEANFILES += www/admin/maintainer/maintainer.php
+EXTRA_DIST += www/admin/maintainer/maintainer.php.in
+
+www/admin/service/index.php:
+ @$(mkinstalldirs) www/admin/service
+ $(do_subst) <$(srcdir)/www/admin/service/index.php.in >$@
+CLEANFILES += www/admin/service/index.php
+EXTRA_DIST += www/admin/service/index.php.in
+
+www/admin/sharedfolder/index.php:
+ @$(mkinstalldirs) www/admin/sharedfolder
+ $(do_subst) <$(srcdir)/www/admin/sharedfolder/index.php.in >$@
+CLEANFILES += www/admin/sharedfolder/index.php
+EXTRA_DIST += www/admin/sharedfolder/index.php.in
+
+www/admin/sharedfolder/sf.php:
+ @$(mkinstalldirs) www/admin/sharedfolder
+ $(do_subst) <$(srcdir)/www/admin/sharedfolder/sf.php.in >$@
+CLEANFILES += www/admin/sharedfolder/sf.php
+EXTRA_DIST += www/admin/sharedfolder/sf.php.in
+
+www/admin/user/deliver.php:
+ @$(mkinstalldirs) www/admin/user
+ $(do_subst) <$(srcdir)/www/admin/user/deliver.php.in >$@
+CLEANFILES += www/admin/user/deliver.php
+EXTRA_DIST += www/admin/user/deliver.php.in
+
+www/admin/user/forward.php:
+ @$(mkinstalldirs) www/admin/user
+ $(do_subst) <$(srcdir)/www/admin/user/forward.php.in >$@
+CLEANFILES += www/admin/user/forward.php
+EXTRA_DIST += www/admin/user/forward.php.in
+
+www/admin/user/index.php:
+ @$(mkinstalldirs) www/admin/user
+ $(do_subst) <$(srcdir)/www/admin/user/index.php.in >$@
+CLEANFILES += www/admin/user/index.php
+EXTRA_DIST += www/admin/user/index.php.in
+
+www/admin/user/vacation.php:
+ @$(mkinstalldirs) www/admin/user
+ $(do_subst) <$(srcdir)/www/admin/user/vacation.php.in >$@
+CLEANFILES += www/admin/user/vacation.php
+EXTRA_DIST += www/admin/user/vacation.php.in
+###
+
php/admin/include/auth.class.php:
@$(mkinstalldirs) php/admin/include
$(do_subst) <$(srcdir)/php/admin/include/auth.class.php.in >$@
CLEANFILES += php/admin/include/auth.class.php
EXTRA_DIST += php/admin/include/auth.class.php.in
+php/admin/include/config.php: Makefile php/admin/include/config.php.in
+ $(mkinstalldirs) php/admin/include
+ $(do_subst) <$(srcdir)/php/admin/include/config.php.in >$@
+CLEANFILES += php/admin/include/config.php
+EXTRA_DIST += php/admin/include/config.php.in
+
php/admin/include/headers.php:
@$(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/include/mysmarty.php:
+ @$(mkinstalldirs) php/admin/include
+ $(do_subst) <$(srcdir)/php/admin/include/mysmarty.php.in >$@
+CLEANFILES += php/admin/include/mysmarty.php
+EXTRA_DIST += php/admin/include/mysmarty.php.in
php/admin/templates/page.tpl:
@$(mkinstalldirs) php/admin/templates
More information about the commits
mailing list