richard: server/kolab-webadmin/kolab-webadmin ChangeLog, 1.11, 1.12 Makefile.am, 1.28, 1.29
cvs at intevation.de
cvs at intevation.de
Fri Dec 30 20:27:51 CET 2005
Author: richard
Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin
In directory doto:/tmp/cvs-serv15409
Modified Files:
ChangeLog Makefile.am
Log Message:
add webserver_web_prefix to webserver_document_root
so the involved files are installed in the right directory.
Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/ChangeLog,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- ChangeLog 30 Dec 2005 11:01:47 -0000 1.11
+++ ChangeLog 30 Dec 2005 19:27:49 -0000 1.12
@@ -1,3 +1,7 @@
+2005-12-30 Richard Bos <richard at radoeka.nl>
+ * Makefile.am: add webserver_web_prefix so the involved files
+ are installed in the right directory.
+
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
Index: Makefile.am
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/Makefile.am,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- Makefile.am 30 Dec 2005 11:11:25 -0000 1.28
+++ Makefile.am 30 Dec 2005 19:27:49 -0000 1.29
@@ -8,14 +8,14 @@
WSTOPLEVEL_FILES = www/favicon.ico
-wstopleveldir = $(webserver_document_root)
+wstopleveldir = $(webserver_document_root)$(webserver_web_prefix)
dist_wstoplevel_DATA = $(WSTOPLEVEL_FILES)
WSKOLAB_FILES = www/admin/index.php \
www/admin/logout.php \
www/admin/style.css
-wskolabdir = $(webserver_document_root)/admin
+wskolabdir = $(webserver_document_root)$(webserver_web_prefix)/admin
dist_wskolab_DATA = $(WSKOLAB_FILES)
WSADDRESSBOOK_FILES = www/admin/addressbook/addr.php \
More information about the commits
mailing list