richard: server/kolabd/kolabd ChangeLog, 1.25, 1.26 Makefile.am, 1.10, 1.11

cvs at intevation.de cvs at intevation.de
Fri Dec 30 20:31:17 CET 2005


Author: richard

Update of /kolabrepository/server/kolabd/kolabd
In directory doto:/tmp/cvs-serv15492

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.

* Makefile.am: add webserver_web_prefix so the involved files
  are installed in the right directory.
* dist_conf/suse: adjusted freebusy_cachedir to reflect the
  addition of webserver_web_prefix



Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- ChangeLog	30 Dec 2005 10:46:27 -0000	1.25
+++ ChangeLog	30 Dec 2005 19:31:15 -0000	1.26
@@ -1,4 +1,10 @@
-2005-12-27 Marcus Hüwe <suse-tux at gmx.de>
+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.
+	* dist_conf/suse: adjusted freebusy_cachedir to reflect the
+	  addition of webserver_web_prefix
+
+2005-12-30 Marcus Hüwe <suse-tux at gmx.de>
 	Patch committed by Richard Bos, see issue1049
 	* templates/resmgr.conf.template.in,
 	  templates/fbview.conf.template.in: added

Index: Makefile.am
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/Makefile.am,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- Makefile.am	22 Dec 2005 22:15:06 -0000	1.10
+++ Makefile.am	30 Dec 2005 19:31:15 -0000	1.11
@@ -516,11 +516,11 @@
 install-data-hook:
 	$(mkinstalldirs) -m 755 $(DESTDIR)
 	$(mkinstalldirs) -m 755 $(DESTDIR)$(kolab_logdir)
-	$(mkinstalldirs) -m 755 $(DESTDIR)$(webserver_document_root)/cgi-bin
-	$(mkinstalldirs) -m 755 $(DESTDIR)$(webserver_document_root)/icons
-	$(mkinstalldirs) -m 755 $(DESTDIR)$(webserver_document_root)/freebusy
+	$(mkinstalldirs) -m 755 $(DESTDIR)$(webserver_document_root)$(webserver_web_prefix)/cgi-bin
+	$(mkinstalldirs) -m 755 $(DESTDIR)$(webserver_document_root)$(webserver_web_prefix)/icons
+	$(mkinstalldirs) -m 755 $(DESTDIR)$(webserver_document_root)$(webserver_web_prefix)/freebusy
 	$(mkinstalldirs) -m 755 $(DESTDIR)$(webserver_sessions)
-#	$(mkinstalldirs) -m 755 $(DESTDIR)$(webserver_document_root)/locks
+#	$(mkinstalldirs) -m 755 $(DESTDIR)$(webserver_document_root)$(webserver_web_prefix)/locks
 	chmod +775 $(DESTDIR)$(kolabdir)$(kolab_FILES)
 	chmod +600 $(DESTDIR)$(kolabconfigdir)/kolab.conf
 	chmod +744 $(DESTDIR)$(kolabnamespacedir)/*





More information about the commits mailing list