richard: server/kolab-webadmin/kolab-webadmin ChangeLog, 1.15, 1.16 Makefile.am, 1.30, 1.31

[cvs at intevation.de]

Author: richard

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

Modified Files:
	ChangeLog Makefile.am 
Log Message:
Use the @RPM@ in www/admin/kolab/versions.php, to show the version
nnumber of the used packages.



Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/ChangeLog,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- ChangeLog	14 Jan 2006 22:16:05 -0000	1.15
+++ ChangeLog	15 Jan 2006 21:05:54 -0000	1.16
@@ -1,3 +1,9 @@
+2006-01-15 Marcus Hüwe <suse-tux at gmx.de>
+	Patch committed by Richard Bos
+	* www/admin/kolab/versions.php: moved to /www/admin/kolab/versions.php.in,
+	  replaced "$kolab_prefix/bin/openpkg" with @RPM@
+	* Makefile.am: make www/admin/kolab/versions.php.in
+
 2006-01-14 Marcus Hüwe <suse-tux at gmx.de>
 	Patch commited by Richard Bos
 	* configure.ac: replaced --enable-dist with --with-dist

Index: Makefile.am
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/Makefile.am,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- Makefile.am	3 Jan 2006 22:04:37 -0000	1.30
+++ Makefile.am	15 Jan 2006 21:05:54 -0000	1.31
@@ -41,14 +41,15 @@
 
 WSABOUT_FILES = www/admin/kolab/erfrakon.php \
 	www/admin/kolab/index.php \
-	www/admin/kolab/versions.php \
 	www/admin/kolab/intevation.php \
 	www/admin/kolab/codefusion.php \
 	www/admin/kolab/kdab.php \
 	www/admin/kolab/kde.php
 
 wsaboutdir = $(wskolabdir)/kolab
-dist_wsabout_DATA = $(WSABOUT_FILES)
+wsabout_DATA = $(WSABOUT_FILES) \
+	www/admin/kolab/versions.php
+EXTRA_DIST += $(WSABOUT_FILES)
 
 WSMAINTAINER_FILES = www/admin/maintainer/maintainer.php \
 	www/admin/maintainer/index.php
@@ -229,6 +230,12 @@
 	$(do_subst) <$(srcdir)/www/admin/user/user.php.in >$@
 CLEANFILES += www/admin/user/user.php
 EXTRA_DIST += www/admin/user/user.php.in
+
+www/admin/kolab/versions.php:
+	@$(mkinstalldirs) www/admin/kolab
+	$(do_subst) <$(srcdir)/www/admin/kolab/versions.php.in >$@
+CLEANFILES += www/admin/kolab/versions.php
+EXTRA_DIST += www/admin/kolab/versions.php.in
 
 
 install-data-hook: