[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
trans-coord/gnun/server/gnun ChangeLog GNUmakef...
From: |
Pavel Kharitonov |
Subject: |
trans-coord/gnun/server/gnun ChangeLog GNUmakef... |
Date: |
Sun, 25 Dec 2011 08:01:31 +0000 |
CVSROOT: /sources/trans-coord
Module name: trans-coord
Changes by: Pavel Kharitonov <ineiev> 11/12/25 08:01:31
Modified files:
gnun/server/gnun: ChangeLog GNUmakefile config.mk config.mk.in
configure.ac
Log message:
Add an option to use old or new conventions for English URLs.
* configure.ac: Add `--disable-multiviews' option.
* config.mk.in (MULTIVIEWS): New variable.
* GNUmakefile (generate-translinks): Take into account
the `MULTIVIEWS' variable.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/ChangeLog?cvsroot=trans-coord&r1=1.217&r2=1.218
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/GNUmakefile?cvsroot=trans-coord&r1=1.104&r2=1.105
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/config.mk?cvsroot=trans-coord&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/config.mk.in?cvsroot=trans-coord&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/configure.ac?cvsroot=trans-coord&r1=1.29&r2=1.30
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/ChangeLog,v
retrieving revision 1.217
retrieving revision 1.218
diff -u -b -r1.217 -r1.218
--- ChangeLog 20 Dec 2011 04:52:50 -0000 1.217
+++ ChangeLog 25 Dec 2011 08:01:30 -0000 1.218
@@ -1,3 +1,11 @@
+2011-12-25 Pavel Kharitonov <address@hidden>
+
+ Add an option to use old or new conventions for English URLs.
+ * configure.ac: Add `--disable-multiviews' option.
+ * config.mk.in (MULTIVIEWS): New variable.
+ * GNUmakefile (generate-translinks): Take into account
+ the `MULTIVIEWS' variable.
+
2011-12-20 Pavel Kharitonov <address@hidden>
* gnun-add-fuzzy-diff.in: Parse command line parameters
Index: GNUmakefile
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/GNUmakefile,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -b -r1.104 -r1.105
--- GNUmakefile 14 Dec 2011 14:35:28 -0000 1.104
+++ GNUmakefile 25 Dec 2011 08:01:31 -0000 1.105
@@ -253,8 +253,9 @@
| while read language; do \
code=$$$${language%% *}; \
case $$$${code} in \
- en ) suffix="" ;; \
- * ) suffix=.$$$${code} ;; \
+ en ) suffix=""; \
+ url_suffix=$(if $(findstring no, $(MULTIVIEWS)),"",".en") ;; \
+ * ) suffix=.$$$${code}; url_suffix="$$$${suffix}" ;; \
esac; \
lang=$$$${language% *}; lang=$$$${lang#* }; \
name=$$$${language##* }; \
@@ -262,7 +263,7 @@
article=$(subst /po/,/,$(1)); \
if test -f $$$${article}$$$${suffix}.html; then \
echo '<!-- '$$$${lang}' -->' >> $$$${file}; \
- echo -n '<li><a href="'$$$${url_stem}$$$${suffix}.html'">' \
+ echo -n '<li><a href="'$$$${url_stem}$$$${url_suffix}.html'">' \
>> $$$${file}; \
echo $$$${name}'</a> ['$$$${code}']</li>' >> $$$${file}; \
fi; \
Index: config.mk
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/config.mk,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- config.mk 5 Nov 2011 04:20:31 -0000 1.7
+++ config.mk 25 Dec 2011 08:01:31 -0000 1.8
@@ -14,5 +14,6 @@
PO4A_GETTEXTIZE := po4a-gettextize
PO4A_TRANSLATE := po4a-translate
WDIFF := /usr/bin/wdiff
+MULTIVIEWS := yes
-include gnun.conf
Index: config.mk.in
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/config.mk.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- config.mk.in 5 Nov 2011 04:16:19 -0000 1.7
+++ config.mk.in 25 Dec 2011 08:01:31 -0000 1.8
@@ -15,6 +15,7 @@
PO4A_GETTEXTIZE := @PO4A_GETTEXTIZE@
PO4A_TRANSLATE := @PO4A_TRANSLATE@
WDIFF := @WDIFF@
+MULTIVIEWS := @MULTIVIEWS@
prefix := @prefix@
-include @sysconfdir@/gnun.conf
Index: configure.ac
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/configure.ac,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- configure.ac 12 Dec 2011 14:01:48 -0000 1.29
+++ configure.ac 25 Dec 2011 08:01:31 -0000 1.30
@@ -39,6 +39,16 @@
CHECK_GNU_MAKE
AS_IF([test -z "$ifGNUmake"], [decent_make=yes], [decent_make=no])
+AC_MSG_CHECKING([whether to use www.gnu.org Multiviews naming conventions])
+AC_ARG_ENABLE([multiviews],
+ [AS_HELP_STRING([--disable-multiviews],
+ [Use pre-Multiviews naming conventions for English URLs (`foo.html'
+ rather than `foo.en.html').])]
+)
+AS_CASE(["x$enable_multiviews"],[xno],,[enable_multiviews=yes])
+AC_MSG_RESULT([$enable_multiviews])
+AC_SUBST([MULTIVIEWS], [$enable_multiviews])
+
AC_ARG_VAR([AWK], [the `awk' program])
AX_CHECK_AWK_GSUB([decent_awk=yes], [decent_awk=no])
@@ -219,6 +229,7 @@
echo "GRACE support... $decent_awk"
echo "NOTIFY support... $have_mail"
echo "VCS support... $have_vcs $cvs $svn $bzr"
+echo "Use Multiviews naming conventions... $enable_multiviews"
echo
echo "Type \"make\" to build the scripts and \"make install\" to install
them along with the manuals."
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- trans-coord/gnun/server/gnun ChangeLog GNUmakef...,
Pavel Kharitonov <=