[vhffs-dev] [1448] distcheck adjustments

[subversion@xxxxxxxxxxxxx]

Revision: 1448
Author:   beuss
Date:     2009-06-17 16:44:35 +0200 (Wed, 17 Jun 2009)

Log Message:
-----------
distcheck adjustments

Modified Paths:
--------------
    trunk/Makefile.am
    trunk/vhffs-forum/Makefile.am
    trunk/vhffs-intl/update-POTFILES.in.sh
    trunk/vhffs-irc/Makefile.am
    trunk/vhffs-mw/Makefile.am
    trunk/vhffs-tools/Makefile.am
    trunk/vhffs-tools/mans/Makefile.am


Modified: trunk/Makefile.am
===================================================================
--- trunk/Makefile.am	2009-06-16 20:10:48 UTC (rev 1447)
+++ trunk/Makefile.am	2009-06-17 14:44:35 UTC (rev 1448)
@@ -3,7 +3,8 @@
 SITE_CONFIG_FILE = @CONFDIR@/vhffs.conf
 
 DISTCHECK_CONFIGURE_FLAGS = --enable-extra --enable-panel \
-	--enable-public --enable-listengine --enable-robots --enable-backend --enable-compat --enable-jabber --enable-tools --enable-vhffs-fs
+	--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

Modified: trunk/vhffs-forum/Makefile.am
===================================================================
--- trunk/vhffs-forum/Makefile.am	2009-06-16 20:10:48 UTC (rev 1447)
+++ trunk/vhffs-forum/Makefile.am	2009-06-17 14:44:35 UTC (rev 1448)
@@ -1,7 +1,7 @@
 if INSTALL_EXTRA
 
 forumdir=@EXTRADIR@/forum
-forum_DATA=antibot.tar.bz2 \
+dist_forum_DATA=antibot.tar.bz2 \
 	punbb-1.2.14_vhffs.patch \
 	punbb-1.2.15_vhffs.patch
 

Modified: trunk/vhffs-intl/update-POTFILES.in.sh
===================================================================
--- trunk/vhffs-intl/update-POTFILES.in.sh	2009-06-16 20:10:48 UTC (rev 1447)
+++ trunk/vhffs-intl/update-POTFILES.in.sh	2009-06-17 14:44:35 UTC (rev 1448)
@@ -1,5 +1,6 @@
 #!/bin/bash
 VHFFS_DIRS='../vhffs-contrib ../vhffs-panel ../vhffs-forum ../vhffs-listengine ../vhffs-tools ../vhffs-mw ../vhffs-api ../vhffs-shells ../vhffs-public ../vhffs-jabber ../vhffs-irc ../vhffs-stsmon'
+touch template_strings.pl
 find $VHFFS_DIRS -name '*.tmpl' | xargs perl -ne 'if(/<TMPL_I18N\s+KEY="([^"]+)/i) { print "gettext(\"$1\");\n"; }' > template_strings.pl
 find $VHFFS_DIRS -name '*.tt' | xargs perl -ne 'print "gettext(\"$1\");\n" if(/\[%\s+'\''([^|]+?)'\''\s*|\s*i18n\b/);' >> template_strings.pl
 find $VHFFS_DIRS -name '*.p[ml]' | sed s!^../!! > 'POTFILES.in'

Modified: trunk/vhffs-irc/Makefile.am
===================================================================
--- trunk/vhffs-irc/Makefile.am	2009-06-16 20:10:48 UTC (rev 1447)
+++ trunk/vhffs-irc/Makefile.am	2009-06-17 14:44:35 UTC (rev 1448)
@@ -1,7 +1,7 @@
 if INSTALL_IRC
 
 ircdir = @IRCDIR@
-irc_SCRIPTS = modobot.pl
+dist_irc_SCRIPTS = modobot.pl
 
 # Define the substitution we need to point perl script at correct location
 do_sed = $(SED) --in-place \

Modified: trunk/vhffs-mw/Makefile.am
===================================================================
--- trunk/vhffs-mw/Makefile.am	2009-06-16 20:10:48 UTC (rev 1447)
+++ trunk/vhffs-mw/Makefile.am	2009-06-17 14:44:35 UTC (rev 1448)
@@ -1,6 +1,6 @@
 if INSTALL_EXTRA
 
 mediawikidir=@EXTRADIR@/mediawiki
-mediawiki_DATA=VHFFSAuthPlugin.php
+dist_mediawiki_DATA=VHFFSAuthPlugin.php
 
 endif

Modified: trunk/vhffs-tools/Makefile.am
===================================================================
--- trunk/vhffs-tools/Makefile.am	2009-06-16 20:10:48 UTC (rev 1447)
+++ trunk/vhffs-tools/Makefile.am	2009-06-17 14:44:35 UTC (rev 1448)
@@ -1,6 +1,6 @@
 if INSTALL_TOOLS
 
-SUBDIRS = src
+SUBDIRS = src mans
 DIST_SUBDIRS = src mans
 
 endif

Modified: trunk/vhffs-tools/mans/Makefile.am
===================================================================
--- trunk/vhffs-tools/mans/Makefile.am	2009-06-16 20:10:48 UTC (rev 1447)
+++ trunk/vhffs-tools/mans/Makefile.am	2009-06-17 14:44:35 UTC (rev 1448)
@@ -1 +1 @@
-EXTRA_DIST = vhffs-makeadmin.1  vhffs-quota.1  vhffs-userinfo.1  webdir.1
+dist_man1_MANS=vhffs-makeadmin.1  vhffs-quota.1  vhffs-userinfo.1  webdir.1