richard: server/kolab-webadmin/kolab-webadmin ChangeLog, 1.80, 1.81 Makefile.am, 1.42, 1.43
cvs at kolab.org
cvs at kolab.org
Sun Feb 17 21:34:19 CET 2008
Author: richard
Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin
In directory doto:/tmp/cvs-serv16162
Modified Files:
ChangeLog Makefile.am
Log Message:
made it possible to reuse the code that leaves in or removes code depending
on the presence of openpkg. Introduced a variable w_or_wo_openpkg
(with_or_without_openpkg).
Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/ChangeLog,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -d -r1.80 -r1.81
--- ChangeLog 17 Feb 2008 14:15:57 -0000 1.80
+++ ChangeLog 17 Feb 2008 20:34:17 -0000 1.81
@@ -5,6 +5,10 @@
installation. This way the page shows up, much faster on native
pkg installations
+ * Makefile.am: made it possible to reuse the code that leaves in or
+ removes code depending on the presence of openpkg. Introduced
+ a variable w_or_wo_openpkg (with_or_without_openpkg).
+
2008-02-16 Richard Bos <richard at radoeka.nl>
* php/admin/include/menu.php:
Index: Makefile.am
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/Makefile.am,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- Makefile.am 3 Jul 2007 22:07:13 -0000 1.42
+++ Makefile.am 17 Feb 2008 20:34:17 -0000 1.43
@@ -4,6 +4,13 @@
@distribution@
@common@
+# With or Without openpkg (w_or_wo_openpkg) definition
+if OPENPKG
+ w_or_wo_openpkg = sed -e 's/^@OPENPKG@//;/^@WITHOUT_OPENPKG@/d'
+else
+ w_or_wo_openpkg = sed -e 's/^@WITHOUT_OPENPKG@//;/^@OPENPKG@/d'
+endif
+
distclean-local:
rm -rf $(srcdir)/autom4te*.cache
@@ -390,11 +397,7 @@
php/admin/templates/versions.tpl: php/admin/templates/versions.tpl.in
@$(mkinstalldirs) php/admin/templates
-if OPENPKG
- sed 's/^@OPENPKG@//' <$(srcdir)/php/admin/templates/versions.tpl.in >$@
-else
- sed '/^@OPENPKG at .*/d' <$(srcdir)/php/admin/templates/versions.tpl.in >$@
-endif
+ $(w_or_wo_openpkg) <$(srcdir)/php/admin/templates/versions.tpl.in >$@
CLEANFILES += php/admin/templates/versions.tpl
EXTRA_DIST += php/admin/templates/versions.tpl.in
More information about the commits
mailing list