summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Bos <richard@radoeka.nl>2008-02-17 20:34:17 (GMT)
committerRichard Bos <richard@radoeka.nl>2008-02-17 20:34:17 (GMT)
commitc46a95a461bde0ee498f6078eb32f0bdfd92446a (patch)
tree23ca3d601e73ab478100e5931a17cf1205625344
parent2a8c8690fb415bd16e1464f8e3a959fd229818a2 (diff)
downloadkolab-webadmin-c46a95a461bde0ee498f6078eb32f0bdfd92446a.tar.gz
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).
-rw-r--r--ChangeLog4
-rw-r--r--Makefile.am13
2 files changed, 12 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 6276d77..706afed 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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@radoeka.nl>
* php/admin/include/menu.php:
diff --git a/Makefile.am b/Makefile.am
index 46c6d61..59630fe 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,6 +4,13 @@ CLEANFILES =
@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 @@ EXTRA_DIST += php/admin/templates/page.tpl.in
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@.*/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