richard: server/kolab-webadmin/kolab-webadmin ChangeLog, 1.7, 1.8 Makefile.am, 1.25, 1.26

cvs at intevation.de cvs at intevation.de
Fri Dec 16 21:36:26 CET 2005


Author: richard

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

Modified Files:
	ChangeLog Makefile.am 
Log Message:
Autoconf patch from Marcus Hüwe.  Use the newer autotools method to
distribute file, do this by using the dist_ prefix.



Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/ChangeLog,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- ChangeLog	14 Dec 2005 19:48:30 -0000	1.7
+++ ChangeLog	16 Dec 2005 20:36:24 -0000	1.8
@@ -1,3 +1,6 @@
+2005-12-16 Marcus Hüwe <suse-tux at gmx.de>
+	* Makefile.am: added dist_ prefix
+
 2005-12-14 Richard Bos <richard at radoeka.nl>
 	* NEWS: added with the latest news from: release-notes.txt
 	* AUTHORS: added

Index: Makefile.am
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/Makefile.am,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- Makefile.am	14 Dec 2005 19:46:15 -0000	1.25
+++ Makefile.am	16 Dec 2005 20:36:24 -0000	1.26
@@ -9,32 +9,32 @@
 WSTOPLEVEL_FILES = www/favicon.ico
 
 wstopleveldir = $(webserver_document_root)
-wstoplevel_DATA = $(WSTOPLEVEL_FILES)
+dist_wstoplevel_DATA = $(WSTOPLEVEL_FILES)
 
 WSKOLAB_FILES = www/admin/index.php \
 	www/admin/logout.php \
 	www/admin/style.css 
 
 wskolabdir = $(webserver_document_root)/admin
-wskolab_DATA = $(WSKOLAB_FILES)
+dist_wskolab_DATA = $(WSKOLAB_FILES)
 
 WSADDRESSBOOK_FILES = www/admin/addressbook/addr.php \
 	www/admin/addressbook/index.php
 
 wsaddressbookdir   = $(wskolabdir)/addressbook
-wsaddressbook_DATA = $(WSADDRESSBOOK_FILES)
+dist_wsaddressbook_DATA = $(WSADDRESSBOOK_FILES)
 
 WSADMINISTRATOR_FILES = www/admin/administrator/admin.php \
 	www/admin/administrator/index.php
 
 wsadminstratordir = $(wskolabdir)/administrator
-wsadminstrator_DATA = $(WSADMINISTRATOR_FILES)
+dist_wsadminstrator_DATA = $(WSADMINISTRATOR_FILES)
 
 WSDISTRIBUTIONLIST_FILES = www/admin/distributionlist/index.php \
 	www/admin/distributionlist/list.php
 
 wsdistributionlistdir = $(wskolabdir)/distributionlist
-wsdistributionlist_DATA = $(WSDISTRIBUTIONLIST_FILES)
+dist_wsdistributionlist_DATA = $(WSDISTRIBUTIONLIST_FILES)
 
 WSABOUT_FILES = www/admin/kolab/erfrakon.php \
 	www/admin/kolab/index.php \
@@ -45,19 +45,19 @@
 	www/admin/kolab/kde.php
 
 wsaboutdir = $(wskolabdir)/kolab
-wsabout_DATA = $(WSABOUT_FILES)
+dist_wsabout_DATA = $(WSABOUT_FILES)
 
 WSMAINTAINER_FILES = www/admin/maintainer/maintainer.php \
 	www/admin/maintainer/index.php
 
 wsmaintainerdir = $(wskolabdir)/maintainer
-wsmaintainer_DATA = $(WSMAINTAINER_FILES)
+dist_wsmaintainer_DATA = $(WSMAINTAINER_FILES)
 
 WSDOMAINMAINTAINER_FILES = www/admin/domainmaintainer/domainmaintainer.php \
 	www/admin/domainmaintainer/index.php
 
 wsdomainmaintainerdir = $(wskolabdir)/domainmaintainer
-wsdomainmaintainer_DATA = $(WSDOMAINMAINTAINER_FILES)
+dist_wsdomainmaintainer_DATA = $(WSDOMAINMAINTAINER_FILES)
 
 WSPICS_FILES = www/admin/pics/erfrakon.png \
 	www/admin/pics/codefusion.png \
@@ -67,18 +67,16 @@
 	www/admin/pics/kolab_logo.png
 
 wspicsdir = $(wskolabdir)/pics
-wspics_DATA = $(WSPICS_FILES)
-
-WSSERVICE_FILES = www/admin/service/index.php
+dist_wspics_DATA = $(WSPICS_FILES)
 
 wsservicedir = $(wskolabdir)/service
-wsservice_DATA = $(WSSERVICE_FILES)
+dist_wsservice_DATA = www/admin/service/index.php
 
 WSSHAREDFOLDER_FILES = www/admin/sharedfolder/sf.php \
 	www/admin/sharedfolder/index.php
 
 wssharedfolderdir = $(wskolabdir)/sharedfolder
-wssharedfolder_DATA = $(WSSHAREDFOLDER_FILES)
+dist_wssharedfolder_DATA = $(WSSHAREDFOLDER_FILES)
 
 WSUSER_FILES = www/admin/user/forward.php \
 	www/admin/user/index.php \
@@ -87,7 +85,7 @@
 	www/admin/user/deliver.php
 
 wsuserdir = $(wskolabdir)/user
-wsuser_DATA = $(WSUSER_FILES)
+dist_wsuser_DATA = $(WSUSER_FILES)
 
 phpkolabdir = $(phplibdir2)/admin
 
@@ -98,8 +96,10 @@
 CLEANFILES += php/admin/include/config.php
 EXTRA_DIST += php/admin/include/config.php.in
 
-PHP_INCLUDES = php/admin/include/config.php \
-	php/admin/include/menu.php \
+php_includes_configdir = $(phpkolabdir)/include
+php_includes_config_DATA = php/admin/include/config.php
+
+PHP_INCLUDES = php/admin/include/menu.php \
 	php/admin/include/debug.php \
 	php/admin/include/form.class.php \
 	php/admin/include/auth.class.php \
@@ -112,7 +112,7 @@
 	php/admin/include/Sieve.php
 
 phpincludesdir = $(phpkolabdir)/include
-phpincludes_DATA = $(PHP_INCLUDES)
+dist_phpincludes_DATA = $(PHP_INCLUDES)
 
 PHP_TEMPLATES = php/admin/templates/maintainerdeleted.tpl \
 	php/admin/templates/kde.tpl \
@@ -145,7 +145,7 @@
 	php/admin/templates/admindeleted.tpl
 
 phptemplatesdir = $(phpkolabdir)/templates
-phptemplates_DATA = $(PHP_TEMPLATES)
+dist_phptemplates_DATA = $(PHP_TEMPLATES)
 
 
 ### i18n stuff
@@ -190,26 +190,7 @@
         NEWS \
         AUTHORS
 
-EXTRA_DIST += dist_conf \
-	$(WSTOPLEVEL_FILES) \
-	$(WSABOUT_FILES) \
-	$(WSADDRESSBOOK_FILES) \
-	$(WSADMINISTRATOR_FILES) \
-	$(WSDISTRIBUTIONLIST_FILES) \
-	$(WSKOLAB_FILES) \
-	$(WSMAINTAINER_FILES) \
-	$(WSDOMAINMAINTAINER_FILES) \
-	$(WSPICS_FILES) \
-	$(WSSERVICE_FILES) \
-	$(WSSHAREDFOLDER_FILES) \
-	$(WSUSER_FILES) \
-	$(PHP_INCLUDES) \
-	$(PHP_TEMPLATES) \
-	$(PHP_LOCALE_DE_PO) \
-	$(PHP_LOCALE_FR_PO) \
-	$(PHP_LOCALE_NL_PO) \
-	$(PHP_LOCALE_IT_PO) \
-	$(PHP_LOCALE_ES_PO)
+EXTRA_DIST += dist_conf
 
 install-data-hook:
 	$(mkinstalldirs) $(DESTDIR)$(phpkolabdir)/templates_c





More information about the commits mailing list