| [vhffs-dev] [569] Fixed a Makefile bug which prevented vhffs-tools installation. |
[ Thread Index |
Date Index
| More vhffs.org/vhffs-dev Archives
]
Revision: 569
Author: beuss
Date: 2007-04-16 21:59:04 +0000 (Mon, 16 Apr 2007)
Log Message:
-----------
Fixed a Makefile bug which prevented vhffs-tools installation.
Added l10n to configure stuff.
Modified Paths:
--------------
trunk/Makefile.am
trunk/configure.ac
trunk/vhffs-backend/conf/vhffs.conf.dist.in
trunk/vhffs-backend/conf/vhffs.conf.in
Added Paths:
-----------
trunk/vhffs-intl/Makefile.am
Modified: trunk/Makefile.am
===================================================================
--- trunk/Makefile.am 2007-04-16 17:09:39 UTC (rev 568)
+++ trunk/Makefile.am 2007-04-16 21:59:04 UTC (rev 569)
@@ -2,11 +2,11 @@
SITE_CONFIG_FILE = @CONFDIR@/vhffs.conf
-SUBDIRS = vhffs-api vhffs-backend vhffs-doc vhffs-jabber vhffs-listengine \
- vhffs-panel vhffs-robots vhffs-shells vhffs-tests
+SUBDIRS = vhffs-api vhffs-backend vhffs-doc vhffs-intl vhffs-jabber vhffs-listengine \
+ vhffs-panel vhffs-robots vhffs-shells vhffs-tests vhffs-tools
-EXTRA_DIST = vhffs-compat vhffs-forum vhffs-intl vhffs-irc vhffs-packages \
- vhffs-rfc vhffs-tests vhffs-tools
+EXTRA_DIST = vhffs-compat vhffs-forum vhffs-irc vhffs-packages \
+ vhffs-rfc vhffs-tests
help:
@echo "Help for VHFFS makefile"
@@ -29,4 +29,4 @@
$(make) vhffs-tests/
dist-hook:
- rm -rf `find $(distdir)/ -name '.svn'`
\ No newline at end of file
+ rm -rf `find $(distdir)/ -name '.svn'`
Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac 2007-04-16 17:09:39 UTC (rev 568)
+++ trunk/configure.ac 2007-04-16 21:59:04 UTC (rev 569)
@@ -32,7 +32,7 @@
)
AC_SUBST(SHELLDIR)
-dnl Where to store configuration files
+dnl Where to store tools
AC_ARG_WITH(tools-path,
AC_HELP_STRING([--with-tools-path=path],
[Complete path for tools (executables) (/usr/local/bin)]),
@@ -132,6 +132,15 @@
)
AC_SUBST(MAILSDIR)
+dnl l10n
+AC_ARG_WITH(intl-path,
+ AC_HELP_STRING([--with-intl-path=path],
+ [Complete path for localization files (/usr/share/vhffs/intl)]),
+ INTLDIR=$withval,
+ INTLDIR=/usr/share/vhffs/intl
+)
+AC_SUBST(INTLDIR)
+
dnl documentation
AC_ARG_WITH(doc-path,
AC_HELP_STRING([--with-doc-path=path],
@@ -194,6 +203,7 @@
vhffs-api/src/Vhffs/Makefile
vhffs-backend/Makefile
vhffs-doc/Makefile
+ vhffs-intl/Makefile
vhffs-jabber/Makefile
vhffs-listengine/Makefile
vhffs-listengine/src/Makefile
Modified: trunk/vhffs-backend/conf/vhffs.conf.dist.in
===================================================================
--- trunk/vhffs-backend/conf/vhffs.conf.dist.in 2007-04-16 17:09:39 UTC (rev 568)
+++ trunk/vhffs-backend/conf/vhffs.conf.dist.in 2007-04-16 21:59:04 UTC (rev 569)
@@ -20,7 +20,7 @@
default_theme = vhffs
#Directory which contains internationalisation stuff
- intldir = /usr/share/vhffs/intl/
+ intldir = @INTLDIR@/
#The default language
default_language = en_US
Modified: trunk/vhffs-backend/conf/vhffs.conf.in
===================================================================
--- trunk/vhffs-backend/conf/vhffs.conf.in 2007-04-16 17:09:39 UTC (rev 568)
+++ trunk/vhffs-backend/conf/vhffs.conf.in 2007-04-16 21:59:04 UTC (rev 569)
@@ -20,7 +20,7 @@
default_theme = vhffs
#Directory which contains internationalisation stuff
- intldir = /usr/share/vhffs/intl/
+ intldir = @INTLDIR@/
#The default language
default_language = en_US
Added: trunk/vhffs-intl/Makefile.am
===================================================================
--- trunk/vhffs-intl/Makefile.am 2007-04-16 17:09:39 UTC (rev 568)
+++ trunk/vhffs-intl/Makefile.am 2007-04-16 21:59:04 UTC (rev 569)
@@ -0,0 +1,14 @@
+intldir = @INTLDIR@
+
+languages = es_ES \
+ fr_FR
+
+install-data-hook:
+ for lang in $(languages) ; do \
+ if ! test -e $(intldir)/$$lang/LC_MESSAGES ; then \
+ mkdir -p $(intldir)/$$lang/LC_MESSAGES ; \
+ fi; \
+ echo "$(INSTALL_DATA) result/$$lang/vhffs.mo $(intldir)/$$lang/LC_MESSAGES/" ; \
+ $(INSTALL_DATA) result/$$lang/vhffs.mo $(intldir)/$$lang/LC_MESSAGES/ ; \
+ done
+