richard: server/kolab-webadmin/kolab-webadmin ChangeLog, 1.18, 1.19 Makefile.am, 1.32, 1.33

cvs at intevation.de cvs at intevation.de
Wed Jan 18 20:35:19 CET 2006


Author: richard

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

Modified Files:
	ChangeLog Makefile.am 
Log Message:
corrected make rule for php/admin/templates/versions.tpl



Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/ChangeLog,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- ChangeLog	17 Jan 2006 22:06:42 -0000	1.18
+++ ChangeLog	18 Jan 2006 19:35:17 -0000	1.19
@@ -1,3 +1,6 @@
+2006-01-17 Richard Bos <richard at radoeka.nl>
+	* Makefile.am: corrected make rule for php/admin/templates/versions.tpl
+
 2006-01-16 Marcus Hüwe <suse-tux at gmx.de>
 	Patch committed by Richard Bos
 	* www/admin/kolab/versions.php.in: use rpm package name variables for
@@ -23,7 +26,6 @@
 	* kolab-webadmin.spec.in: replaced --enable-dist with --with-dist
 
 2006-01-03 Richard Bos <richard at radoeka.nl>
-
 	* Makefile.am: distribute only the files to be distributed
 	  from the dist_conf directory
 	  Added a distclean-local rule to remove the directory autom4te.cache

Index: Makefile.am
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/Makefile.am,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- Makefile.am	17 Jan 2006 22:06:42 -0000	1.32
+++ Makefile.am	18 Jan 2006 19:35:17 -0000	1.33
@@ -225,7 +225,7 @@
 if OPENPKG
 	sed 's/^@OPENPKG@//' <$(srcdir)/php/admin/templates/versions.tpl.in >$@
 else
-	sed 's/^@OPENPKG at .*//' <$(srcdir)/php/admin/templates/versions.tpl.in >$@
+	sed '/^@OPENPKG at .*/d' <$(srcdir)/php/admin/templates/versions.tpl.in >$@
 endif
 CLEANFILES += php/admin/templates/versions.tpl
 EXTRA_DIST += php/admin/templates/versions.tpl.in





More information about the commits mailing list