summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog22
-rw-r--r--Makefile.am71
-rwxr-xr-xbootstrap2
-rw-r--r--configure.ac26
-rw-r--r--php/admin/include/config.php.in2
5 files changed, 62 insertions, 61 deletions
diff --git a/ChangeLog b/ChangeLog
index 9885eb1..88a53e5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,25 @@
+2005-11-15 Richard
+ * bootstrap: copy the dist_conf file from kolabd instead of
+ perl-kolab
+ * configure.ac: removed the options: --enable-wsdocrootdir,
+ --phpdir and pkgdocdir. These are all defined in the
+ kolab/dist_conf files
+ Added $srcdir to the distribution assignments
+ * Makefile.am: replaced do_subst by @common@ (include the dist_conf
+ file), reflected this change in configure.ac as well
+ Replaced wsdocrootdir by webserver_document_root
+ Renamed wsadmin... to the more appropriate name wskolab...
+ Replaced phpdir by phplibdir2
+ Renamed phpadmin... to the more appropriate name phpkolab
+ Added prefix dist_ to dist_phplocaleXX_DATA variables so
+ make distcheck completes
+ Removed test -z "$(webserver_usr)" || chown $(webserver_usr)
+ so make distcheck completes. This should be handled by rpm or
+ an external script. In case an rpm is build it is very likely
+ that the user used in chown is not present.
+ * php/admin/include/config.php.in: changed phpdir to phplibdir2
+
+
2004-07-09 07:37 stephan
* php/admin/templates/en/kolab.tpl: Add appropriate email address
diff --git a/Makefile.am b/Makefile.am
index 65b588f..827857d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,45 +2,41 @@ EXTRA_DIST =
CLEANFILES =
@distribution@
-
-do_subst = sed \
- -e 's,[@]prefix[@],@prefix@,g' \
- -e 's,[@]phpdir[@],$(phpdir),g' \
- -e 's,[@]localstatedir[@],$(localstatedir),g'
+@common@
noinst_HEADERS = @PACKAGE@.spec
WSTOPLEVEL_FILES = www/favicon.ico
-wstopleveldir = $(wsdocrootdir)
+wstopleveldir = $(webserver_document_root)
wstoplevel_DATA = $(WSTOPLEVEL_FILES)
-WSADMIN_FILES = www/admin/index.php \
+WSKOLAB_FILES = www/admin/index.php \
www/admin/logout.php \
www/admin/style.css
-wsadmindir = $(wsdocrootdir)/admin
-wsadmin_DATA = $(WSADMIN_FILES)
+wskolabdir = $(webserver_document_root)/admin
+wskolab_DATA = $(WSKOLAB_FILES)
WSADDRESSBOOK_FILES = www/admin/addressbook/addr.php \
www/admin/addressbook/index.php
-wsaddressbookdir = $(wsadmindir)/addressbook
+wsaddressbookdir = $(wskolabdir)/addressbook
wsaddressbook_DATA = $(WSADDRESSBOOK_FILES)
WSADMINISTRATOR_FILES = www/admin/administrator/admin.php \
www/admin/administrator/index.php
-wsadminstratordir = $(wsadmindir)/administrator
+wsadminstratordir = $(wskolabdir)/administrator
wsadminstrator_DATA = $(WSADMINISTRATOR_FILES)
WSDISTRIBUTIONLIST_FILES = www/admin/distributionlist/index.php \
www/admin/distributionlist/list.php
-wsdistributionlistdir = $(wsadmindir)/distributionlist
+wsdistributionlistdir = $(wskolabdir)/distributionlist
wsdistributionlist_DATA = $(WSDISTRIBUTIONLIST_FILES)
-WSKOLAB_FILES = www/admin/kolab/erfrakon.php \
+WSABOUT_FILES = www/admin/kolab/erfrakon.php \
www/admin/kolab/index.php \
www/admin/kolab/versions.php \
www/admin/kolab/intevation.php \
@@ -48,19 +44,19 @@ WSKOLAB_FILES = www/admin/kolab/erfrakon.php \
www/admin/kolab/kdab.php \
www/admin/kolab/kde.php
-wskolabdir = $(wsadmindir)/kolab
-wskolab_DATA = $(WSKOLAB_FILES)
+wsaboutdir = $(wskolabdir)/kolab
+wsabout_DATA = $(WSABOUT_FILES)
WSMAINTAINER_FILES = www/admin/maintainer/maintainer.php \
www/admin/maintainer/index.php
-wsmaintainerdir = $(wsadmindir)/maintainer
+wsmaintainerdir = $(wskolabdir)/maintainer
wsmaintainer_DATA = $(WSMAINTAINER_FILES)
WSDOMAINMAINTAINER_FILES = www/admin/domainmaintainer/domainmaintainer.php \
www/admin/domainmaintainer/index.php
-wsdomainmaintainerdir = $(wsadmindir)/domainmaintainer
+wsdomainmaintainerdir = $(wskolabdir)/domainmaintainer
wsdomainmaintainer_DATA = $(WSDOMAINMAINTAINER_FILES)
WSPICS_FILES = www/admin/pics/erfrakon.png \
@@ -70,19 +66,19 @@ WSPICS_FILES = www/admin/pics/erfrakon.png \
www/admin/pics/kde.jpg \
www/admin/pics/kolab_logo.png
-wspicsdir = $(wsadmindir)/pics
+wspicsdir = $(wskolabdir)/pics
wspics_DATA = $(WSPICS_FILES)
WSSERVICE_FILES = www/admin/service/index.php
-wsservicedir = $(wsadmindir)/service
+wsservicedir = $(wskolabdir)/service
wsservice_DATA = $(WSSERVICE_FILES)
-WSsharedfolder_FILES = www/admin/sharedfolder/sf.php \
+WSSHAREDFOLDER_FILES = www/admin/sharedfolder/sf.php \
www/admin/sharedfolder/index.php
-wssharedfolderdir = $(wsadmindir)/sharedfolder
-wssharedfolder_DATA = $(WSsharedfolder_FILES)
+wssharedfolderdir = $(wskolabdir)/sharedfolder
+wssharedfolder_DATA = $(WSSHAREDFOLDER_FILES)
WSUSER_FILES = www/admin/user/forward.php \
www/admin/user/index.php \
@@ -90,10 +86,10 @@ WSUSER_FILES = www/admin/user/forward.php \
www/admin/user/vacation.php \
www/admin/user/deliver.php
-wsuserdir = $(wsadmindir)/user
+wsuserdir = $(wskolabdir)/user
wsuser_DATA = $(WSUSER_FILES)
-phpadmindir = $(phpdir)/admin
+phpkolabdir = $(phplibdir2)/admin
php/admin/include/config.php: Makefile php/admin/include/config.php.in
$(mkinstalldirs) php/admin/include
@@ -115,7 +111,7 @@ PHP_INCLUDES = php/admin/include/config.php \
php/admin/include/locale.php \
php/admin/include/Sieve.php
-phpincludesdir = $(phpadmindir)/include
+phpincludesdir = $(phpkolabdir)/include
phpincludes_DATA = $(PHP_INCLUDES)
PHP_TEMPLATES = php/admin/templates/maintainerdeleted.tpl \
@@ -148,7 +144,7 @@ PHP_TEMPLATES = php/admin/templates/maintainerdeleted.tpl \
php/admin/templates/formcontainer.tpl \
php/admin/templates/admindeleted.tpl
-phptemplatesdir = $(phpadmindir)/templates
+phptemplatesdir = $(phpkolabdir)/templates
phptemplates_DATA = $(PHP_TEMPLATES)
@@ -174,7 +170,7 @@ PHP_LOCALE_IT_MO = php/admin/locale/it/LC_MESSAGES/messages.mo
PHP_LOCALE_ES_PO = php/admin/locale/es/LC_MESSAGES/messages.po
PHP_LOCALE_ES_MO = php/admin/locale/es/LC_MESSAGES/messages.mo
-localedir = $(phpadmindir)/locale
+localedir = $(phpkolabdir)/locale
phplocalededir = $(localedir)/de/LC_MESSAGES
phplocalefrdir = $(localedir)/fr/LC_MESSAGES
@@ -182,15 +178,16 @@ phplocalenldir = $(localedir)/nl/LC_MESSAGES
phplocaleitdir = $(localedir)/it/LC_MESSAGES
phplocaleesdir = $(localedir)/es/LC_MESSAGES
-phplocalede_DATA = $(PHP_LOCALE_DE_MO)
-phplocalefr_DATA = $(PHP_LOCALE_FR_MO)
-phplocalenl_DATA = $(PHP_LOCALE_NL_MO)
-phplocaleit_DATA = $(PHP_LOCALE_IT_MO)
-phplocalees_DATA = $(PHP_LOCALE_ES_MO)
+dist_phplocalede_DATA = $(PHP_LOCALE_DE_MO)
+dist_phplocalefr_DATA = $(PHP_LOCALE_FR_MO)
+dist_phplocalenl_DATA = $(PHP_LOCALE_NL_MO)
+dist_phplocaleit_DATA = $(PHP_LOCALE_IT_MO)
+dist_phplocalees_DATA = $(PHP_LOCALE_ES_MO)
-EXTRA_DIST += $(WSTOPLEVEL_FILES) \
- $(WSADMIN_FILES) \
+EXTRA_DIST += dist_conf \
+ $(WSTOPLEVEL_FILES) \
+ $(WSABOUT_FILES) \
$(WSADDRESSBOOK_FILES) \
$(WSADMINISTRATOR_FILES) \
$(WSDISTRIBUTIONLIST_FILES) \
@@ -199,7 +196,7 @@ EXTRA_DIST += $(WSTOPLEVEL_FILES) \
$(WSDOMAINMAINTAINER_FILES) \
$(WSPICS_FILES) \
$(WSSERVICE_FILES) \
- $(WSsharedfolder_FILES) \
+ $(WSSHAREDFOLDER_FILES) \
$(WSUSER_FILES) \
$(PHP_INCLUDES) \
$(PHP_TEMPLATES) \
@@ -210,5 +207,5 @@ EXTRA_DIST += $(WSTOPLEVEL_FILES) \
$(PHP_LOCALE_ES_PO)
install-data-hook:
- $(mkinstalldirs) $(DESTDIR)$(phpadmindir)/templates_c
- test -z "$(webserver_usr)" || chown $(webserver_usr) $(DESTDIR)$(phpadmindir)/templates_c
+ $(mkinstalldirs) $(DESTDIR)$(phpkolabdir)/templates_c
+# test -z "$(webserver_usr)" || chown $(webserver_usr) $(DESTDIR)$(phpkolabdir)/templates_c
diff --git a/bootstrap b/bootstrap
index a227775..1b077b3 100755
--- a/bootstrap
+++ b/bootstrap
@@ -1,4 +1,4 @@
-cp -pr ../../perl-kolab/dist_conf .
+cp -pr ../../kolabd/kolabd/dist_conf .
touch NEWS README AUTHORS ChangeLog
diff --git a/configure.ac b/configure.ac
index e9283a8..160e3d8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11,30 +11,12 @@ AC_PREFIX_DEFAULT([/usr])
AC_ARG_ENABLE([dist],
[AC_HELP_STRING([--enable-dist=DIST],
[distribution target (default: openpkg)])],
- [distribution=dist_conf/$enable_dist],
- [distribution=dist_conf/kolab])
+ [distribution=$srcdir/dist_conf/$enable_dist],
+ [distribution=$srcdir/dist_conf/kolab])
AC_SUBST_FILE(distribution)
-AC_ARG_ENABLE([wsdocrootdir],
- [AC_HELP_STRING([--enable-wsdocrootdir=DIR],
- [The webserver document root (default: LOCALSTATEDIR/kolab/www)])],
- [wsdocrootdir="$enable_wsdocrootdir"],
- [wsdocrootdir="\$(localstatedir)/kolab/www"])
-AC_SUBST(wsdocrootdir)
-
-AC_ARG_ENABLE([phpdir],
- [AC_HELP_STRING([--enable-phpdir=DIR],
- [The webserver document root (default: LOCALSTATEDIR/kolab/php)])],
- [phpdir="$enable_phpdir"],
- [phpdir="\$(localstatedir)/kolab/php"])
-AC_SUBST(phpdir)
-
-AC_ARG_ENABLE([pkgdocdir],
- [AC_HELP_STRING([--enable-pkgdocdir=DIR],
- [where to install the documentation (default: DATADIR/doc)])],
- [pkgdocdir="$enable_pkgdocdir"],
- [pkgdocdir="\$(datadir)/doc/${PACKAGE}"])
-AC_SUBST(pkgdocdir)
+common=dist_conf/common
+AC_SUBST_FILE(common)
# Checks for libraries.
diff --git a/php/admin/include/config.php.in b/php/admin/include/config.php.in
index 7eade17..131f765 100644
--- a/php/admin/include/config.php.in
+++ b/php/admin/include/config.php.in
@@ -20,7 +20,7 @@
$topdir = '/admin';
$kolab_prefix = '@prefix@';
-$php_dir = '@phpdir@';
+$php_dir = '@phplibdir2@';
$locale_dir = "$php_dir/admin/locale/";
/*