[vhffs-dev] [1128] OK, distcheck is close to work, just have to fix some stuff in vhffs-docs...

[subversion@xxxxxxxxxxxxx]

Revision: 1128
Author:   beuss
Date:     2008-01-12 12:20:19 +0000 (Sat, 12 Jan 2008)

Log Message:
-----------
OK, distcheck is close to work, just have to fix some stuff in vhffs-docs...

Modified Paths:
--------------
    trunk/Makefile.am
    trunk/configure.ac
    trunk/vhffs-backend/Makefile.am
    trunk/vhffs-doc/Makefile.am
    trunk/vhffs-fs/Makefile.am
    trunk/vhffs-fs/configure.ac
    trunk/vhffs-intl/Makefile.in.in
    trunk/vhffs-intl/README
    trunk/vhffs-tests/Makefile.am
    trunk/vhffs-tests/src/Makefile.am

Added Paths:
-----------
    trunk/vhffs-intl/update-POTFILES.in.sh


Modified: trunk/Makefile.am
===================================================================
--- trunk/Makefile.am	2008-01-10 22:29:44 UTC (rev 1127)
+++ trunk/Makefile.am	2008-01-12 12:20:19 UTC (rev 1128)
@@ -2,16 +2,17 @@
 
 SITE_CONFIG_FILE = @CONFDIR@/vhffs.conf
 
+DISTCHECK_CONFIGURE_FLAGS = --enable-doc --enable-panel --enable-public --enable-listengine --enable-robots --enable-backend --enable-compat --enable-jabber --enable-tools --enable-vhffs-fs
+
 if INSTALL_VHFFS_FS 
   SUB_VHFFS_FS=vhffs-fs
 endif
 
-SUBDIRS = vhffs-api vhffs-backend vhffs-doc vhffs-compat vhffs-intl vhffs-jabber vhffs-listengine \
-	vhffs-panel vhffs-public vhffs-robots vhffs-shells vhffs-tests vhffs-themes vhffs-tools $(SUB_VHFFS_FS)
+SUBDIRS = $(SUB_VHFFS_FS) vhffs-api vhffs-packages vhffs-backend vhffs-doc vhffs-compat vhffs-intl vhffs-jabber vhffs-listengine \
+	vhffs-panel vhffs-public vhffs-robots vhffs-shells vhffs-tests vhffs-themes vhffs-tools
 
+EXTRA_DIST = config.rpath m4/ChangeLog vhffs-forum vhffs-irc
 
-EXTRA_DIST = config.rpath m4/ChangeLog  vhffs-forum vhffs-irc vhffs-packages vhffs-tests
-
 help:
 	@echo "Help for VHFFS makefile"
 	@echo " help           display this help"

Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2008-01-10 22:29:44 UTC (rev 1127)
+++ trunk/configure.ac	2008-01-12 12:20:19 UTC (rev 1128)
@@ -1,5 +1,6 @@
 AC_REVISION($Revision: 101 $)dnl
 AC_INIT(vhffs, [4.1-trunk], [support@xxxxxxxxx])
+AC_CONFIG_AUX_DIR([.])
 
 
 AC_PROG_CC
@@ -304,6 +305,7 @@
 	vhffs-jabber/Makefile
 	vhffs-listengine/Makefile
 	vhffs-listengine/src/Makefile
+    vhffs-packages/Makefile
 	vhffs-panel/Makefile
 	vhffs-panel/templates/Makefile
 	vhffs-public/Makefile

Modified: trunk/vhffs-backend/Makefile.am
===================================================================
--- trunk/vhffs-backend/Makefile.am	2008-01-10 22:29:44 UTC (rev 1127)
+++ trunk/vhffs-backend/Makefile.am	2008-01-12 12:20:19 UTC (rev 1128)
@@ -14,8 +14,8 @@
 	if test -f $(DESTDIR)$(CONF_FILE) ; then \
 		echo "$@ will not overwrite existing $(DESTDIR)$(CONF_FILE)" ; \
 	else \
-		echo "$(INSTALL_DATA) vhffs.conf $(DESTDIR)$(CONF_FILE)"; \
-		$(INSTALL_DATA) $(config_DATA) $(DESTDIR)$(CONF_FILE); \
+		echo "$(INSTALL_DATA) $(dist_config_DATA) $(DESTDIR)$(CONF_FILE)"; \
+		$(INSTALL_DATA) $(dist_config_DATA) $(DESTDIR)$(CONF_FILE); \
 		$(do_sed)  $(DESTDIR)$(CONF_FILE); \
 	fi
 

Modified: trunk/vhffs-doc/Makefile.am
===================================================================
--- trunk/vhffs-doc/Makefile.am	2008-01-10 22:29:44 UTC (rev 1127)
+++ trunk/vhffs-doc/Makefile.am	2008-01-12 12:20:19 UTC (rev 1128)
@@ -1,15 +1,20 @@
-EXTRA_DIST = config
+EXTRA_DIST=src
+
 docdir = @DOCDIR@
 
 languages = fr
 
 nobase_dist_doc_DATA = \
-	config/apache/panelconf \
-	config/exim4-mx1/exim4.conf \
-	config/exim4-mx2/exim4.conf \
-	src/fr/vhffs-doc.xml \
-	src/fr/part1/mydns.xml \
-	src/fr/part1/mirror.xml
+	config/exim4-mx1/exim4.conf
+	config/courier/pop3d
+	config/courier/imapd
+	config/courier/pop3d-ssl
+	config/courier/imapd-ssl
+	config/courier/authmodulelist
+	config/courier/authpgsqlrc
+	config/courier/authdaemonrc
+	config/exim4-mx2/exim4.conf
+	config/apache/panelconf
 
 if BUILD_DOC
 install-data-hook:

Modified: trunk/vhffs-fs/Makefile.am
===================================================================
--- trunk/vhffs-fs/Makefile.am	2008-01-10 22:29:44 UTC (rev 1127)
+++ trunk/vhffs-fs/Makefile.am	2008-01-12 12:20:19 UTC (rev 1128)
@@ -1,17 +1,21 @@
 vhffsfsdir=@VHFFSFSDIR@
-vhffsfs_SOURCES=md5c.c vhffsfs.c rquota_xdr.c rquota_clnt.c rquota.h
+vhffsfs_SOURCES=md5c.c vhffsfs.c rquota_xdr.c rquota_clnt.c rquota.h md5.h rquota.x
 vhffsfs_PROGRAMS=vhffsfs
+dist_vhffsfs_SCRIPTS=vhffsfs_run.sh
 
 vhffsfsconfdir=@CONFDIR@
 dist_vhffsfsconf_DATA=vhffsfs.conf.dist
+
 CONF_FILE=@CONFDIR@/vhffsfs.conf
 
+
+# TODO REMOVE THE UGLY elif and use sysconf_DATA
 install-data-hook:
 	@if test -f $(DESTDIR)$(CONF_FILE) ; then \
 		echo "$@ will not overwrite existing $(DESTDIR)$(CONF_FILE)" ; \
-	else \
-		echo "$(INSTALL_DATA) vhffs.conf $(DESTDIR)$(CONF_FILE)"; \
-        $(INSTALL_DATA) $(vhffsfsconf_DATA) $(DESTDIR)$(CONF_FILE); \
+	elif test -f $(dist_vhffsfsconf_DATA) ; then \
+		echo "$(INSTALL_DATA) $(dist_vhffsfsconf_DATA) $(DESTDIR)$(CONF_FILE)"; \
+   	    $(INSTALL_DATA) $(dist_vhffsfsconf_DATA) $(DESTDIR)$(CONF_FILE); \
     fi
 
 

Modified: trunk/vhffs-fs/configure.ac
===================================================================
--- trunk/vhffs-fs/configure.ac	2008-01-10 22:29:44 UTC (rev 1127)
+++ trunk/vhffs-fs/configure.ac	2008-01-12 12:20:19 UTC (rev 1128)
@@ -3,12 +3,14 @@
 
 AC_PREREQ(2.61)
 AC_INIT([VHFFS-fs], [4.1], [bugs@xxxxxxxxx])
+AC_CONFIG_AUX_DIR([.])
 AC_CONFIG_SRCDIR([vhffsfs.c])
 AC_CONFIG_HEADER([config.h])
 
 AM_INIT_AUTOMAKE
 PKG_PROG_PKG_CONFIG
 
+test "x$prefix" = "xNONE" && prefix=
 
 # Checks for programs.
 AC_PROG_CC
@@ -108,7 +110,7 @@
     AC_HELP_STRING([--with-conf-path=path],
         [Complete path for configuration files (/etc/vhffs)]),
     CONFDIR=$withval,
-    CONFDIR=/etc/vhffs
+    CONFDIR=$prefix/etc/vhffs
 )
 AC_SUBST(CONFDIR)
 

Modified: trunk/vhffs-intl/Makefile.in.in
===================================================================
--- trunk/vhffs-intl/Makefile.in.in	2008-01-10 22:29:44 UTC (rev 1127)
+++ trunk/vhffs-intl/Makefile.in.in	2008-01-12 12:20:19 UTC (rev 1128)
@@ -65,6 +65,7 @@
 GMOFILES = @GMOFILES@
 UPDATEPOFILES = @UPDATEPOFILES@
 DUMMYPOFILES = @DUMMYPOFILES@
+DISTFILES.extra1 = template_strings.pl extra_strings.pl
 DISTFILES.common = Makefile.in.in remove-potcdate.sin \
 $(DISTFILES.common.extra1) $(DISTFILES.common.extra2) $(DISTFILES.common.extra3)
 DISTFILES = $(DISTFILES.common) Makevars POTFILES.in \
@@ -349,7 +350,7 @@
 	  fi; \
 	done
 
-update-po: Makefile update-pofiles
+update-po: Makefile
 	$(MAKE) $(DOMAIN).pot-update
 	test -z "$(UPDATEPOFILES)" || $(MAKE) $(UPDATEPOFILES)
 	$(MAKE) update-gmo
@@ -392,11 +393,6 @@
 update-gmo: Makefile $(GMOFILES)
 	@:
 
-# Recreates the POFILES.in file
-update-pofiles:
-	find $(top_builddir) -name '*.tmpl' | xargs perl -ne 'if(/<TMPL_I18N\s+KEY="([^"]+)/i) { print "gettext(\"$$1\");\n"; }' > template_strings.pl
-	find $(top_builddir) -name '*.p[ml]' | sed s!^$(top_builddir)/!! > POTFILES.in
-
 Makefile: Makefile.in.in Makevars $(top_builddir)/config.status @POMAKEFILEDEPS@
 	cd $(top_builddir) \
 	  && $(SHELL) ./config.status $(subdir)/$@.in po-directories

Modified: trunk/vhffs-intl/README
===================================================================
--- trunk/vhffs-intl/README	2008-01-10 22:29:44 UTC (rev 1127)
+++ trunk/vhffs-intl/README	2008-01-12 12:20:19 UTC (rev 1128)
@@ -10,10 +10,10 @@
 If you make a full translation you can add your language to the default
 available languages in vhffs-backend/conf/vhffs.conf.dist.in.
 
-Update translation files
-========================
+Update all translation files
+============================
 
-Run make update-po, this will update POFILES.in (list of files containing
+Run update-POFILES.in.sh, this will update POFILES.in (list of files containing
 translated strings) and update the translations.
 
 

Added: trunk/vhffs-intl/update-POTFILES.in.sh
===================================================================
--- trunk/vhffs-intl/update-POTFILES.in.sh	                        (rev 0)
+++ trunk/vhffs-intl/update-POTFILES.in.sh	2008-01-12 12:20:19 UTC (rev 1128)
@@ -0,0 +1,4 @@
+#!/bin/bash
+find .. -name '*.tmpl' | xargs perl -ne 'if(/<TMPL_I18N\s+KEY="([^"]+)/i) { print "gettext(\"$1\");\n"; }' > template_strings.pl
+find .. -name '*.p[ml]' | sed s!^../!! > 'POTFILES.in'
+


Property changes on: trunk/vhffs-intl/update-POTFILES.in.sh
___________________________________________________________________
Name: svn:executable
   + *

Modified: trunk/vhffs-tests/Makefile.am
===================================================================
--- trunk/vhffs-tests/Makefile.am	2008-01-10 22:29:44 UTC (rev 1127)
+++ trunk/vhffs-tests/Makefile.am	2008-01-12 12:20:19 UTC (rev 1128)
@@ -1 +1,4 @@
-SUBDIRS = src
\ No newline at end of file
+SUBDIRS = src
+testsconfdir=@DOCDIR@/tests
+
+nobase_dist_testsconf_DATA = conf/vhffs.conf

Modified: trunk/vhffs-tests/src/Makefile.am
===================================================================
--- trunk/vhffs-tests/src/Makefile.am	2008-01-10 22:29:44 UTC (rev 1127)
+++ trunk/vhffs-tests/src/Makefile.am	2008-01-12 12:20:19 UTC (rev 1128)
@@ -1,2 +1,9 @@
-TESTS_ENVIRONMENT = @PERL@ -I . -I @VHFFS_LIBDIR@
-TESTS = Functions.pl 
+testsdir = @DOCDIR@/tests
+
+nobase_dist_tests_SCRIPTS = \
+	Functions.pl
+
+nobase_dist_tests_DATA = \
+	Vhffs/Tests/Main.pm \
+	Vhffs/Tests/Utils.pm
+