richard: server/kolab-webadmin/kolab-webadmin ChangeLog, 1.10, 1.11 Makefile.am, 1.26, 1.27

[cvs at intevation.de]

Author: richard

Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin
In directory doto:/tmp/cvs-serv5969

Modified Files:
	ChangeLog Makefile.am 
Log Message:
Add a  webserver prefix.  The latter means that kolab will be reachable
at e.g. https://www.domain.tld/kolab instead of just https://www.domain.tld/

This is done by the adding a variable web_server_prefix.  In case of just
kolab this variable is left empty and nothing changes compared to the old
situation.
Other (distributions) could define this variable and the webserver prefix
is than added during build time.

* php/admin/include/auth.class.php: moved to
  php/admin/include/auth.class.php.in
* php/admin/include/headers.php: moved to
  php/admin/include/headers.php.in
* php/admin/templates/page.tpl: moved to php/admin/templates/page.tpl.in
* www/admin/logout.php: moved to www/admin/logout.php.in
* www/admin/user/user.php: moved to www/admin/user/user.php.in
* php/admin/include/auth.class.php.in,
  php/admin/include/headers.php.in,
  php/admin/templates/page.tpl.in,
  www/admin/logout.php.in,
  www/admin/user/user.php.in: added @webserver_web_prefix@
* Makefile.am: added some code for the @webserver_web_prefix@



Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/ChangeLog,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- ChangeLog	22 Dec 2005 22:38:25 -0000	1.10
+++ ChangeLog	30 Dec 2005 11:01:47 -0000	1.11
@@ -1,3 +1,19 @@
+2005-12-30 Marcus Hüwe <suse-tux at gmx.de>
+	Patch committed by Richard Bos, see issue1049
+	* php/admin/include/auth.class.php: moved to
+	  php/admin/include/auth.class.php.in
+	* php/admin/include/headers.php: moved to
+	  php/admin/include/headers.php.in
+	* php/admin/templates/page.tpl: moved to php/admin/templates/page.tpl.in
+	* www/admin/logout.php: moved to www/admin/logout.php.in
+	* www/admin/user/user.php: moved to www/admin/user/user.php.in
+	* php/admin/include/auth.class.php.in,
+	  php/admin/include/headers.php.in,
+	  php/admin/templates/page.tpl.in,
+	  www/admin/logout.php.in,
+	  www/admin/user/user.php.in: added @webserver_web_prefix@
+	* Makefile.am: added some code for the @webserver_web_prefix@
+
 2005-12-22 Richard Bos <richard at radoeka.nl>
 	* www/admin/user/deliver.php,
 	  www/admin/user/forward.php,

Index: Makefile.am
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/Makefile.am,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- Makefile.am	16 Dec 2005 20:36:24 -0000	1.26
+++ Makefile.am	30 Dec 2005 11:01:47 -0000	1.27
@@ -192,6 +192,38 @@
 
 EXTRA_DIST += dist_conf
 
+
+php/admin/include/auth.class.php:
+	@$(mkinstalldirs) php/admin/include
+	$(do_subst) <$(srcdir)/php/admin/include/auth.class.php.in >$@
+CLEANFILES += php/admin/incldue/auth.class.php
+EXTRA_DIST += php/admin/incldue/auth.class.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/templates/page.tpl:
+	@$(mkinstalldirs) php/admin/templates
+	$(do_subst) <$(srcdir)/php/admin/templates/page.tpl.in >$@
+CLEANFILES += php/admin/templates/page.tpl
+EXTRA_DIST += php/admin/templates/page.tpl.in
+
+www/admin/logout.php:
+	@$(mkinstalldirs) www/admin
+	$(do_subst) <$(srcdir)/www/admin/logout.php.in >$@
+CLEANFILES += www/admin/logout.php
+EXTRA_DIST += www/admin/logout.php.in
+
+www/admin/user/user.php:
+	@$(mkinstalldirs) www/admin/user
+	$(do_subst) <$(srcdir)/www/admin/user/user.php.in >$@
+CLEANFILES += www/admin/user/user.php
+EXTRA_DIST += www/admin/user/user.php.in
+
+
 install-data-hook:
 	$(mkinstalldirs) $(DESTDIR)$(phpkolabdir)/templates_c
 # 	test -z "$(webserver_usr)" || chown $(webserver_usr) $(DESTDIR)$(phpkolabdir)/templates_c