diff -Nru devhelp-3.4.0/aclocal.m4 devhelp-3.4.1/aclocal.m4
--- devhelp-3.4.0/aclocal.m4 2012-03-27 02:55:13.000000000 +0000
+++ devhelp-3.4.1/aclocal.m4 2012-04-16 11:55:27.000000000 +0000
@@ -1,4 +1,4 @@
-# generated automatically by aclocal 1.11.3 -*- Autoconf -*-
+# generated automatically by aclocal 1.11.5 -*- Autoconf -*-
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation,
@@ -38,7 +38,7 @@
[am__api_version='1.11'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
-m4_if([$1], [1.11.3], [],
+m4_if([$1], [1.11.5], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@@ -54,7 +54,7 @@
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.11.3])dnl
+[AM_AUTOMAKE_VERSION([1.11.5])dnl
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
@@ -1311,7 +1311,8 @@
# ----------------------------------
AC_DEFUN([PKG_PROG_PKG_CONFIG],
[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
-m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
+m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$])
+m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$])
AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])
AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path])
AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path])
@@ -1357,7 +1358,8 @@
pkg_cv_[]$1="$$1"
elif test -n "$PKG_CONFIG"; then
PKG_CHECK_EXISTS([$3],
- [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
+ [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes ],
[pkg_failed=yes])
else
pkg_failed=untried
@@ -1405,9 +1407,9 @@
AC_MSG_RESULT([no])
_PKG_SHORT_ERRORS_SUPPORTED
if test $_pkg_short_errors_supported = yes; then
- $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1`
+ $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1`
else
- $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1`
+ $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
@@ -1420,7 +1422,7 @@
Consider adjusting the PKG_CONFIG_PATH environment variable if you
installed software in a non-standard prefix.
-_PKG_TEXT])
+_PKG_TEXT])[]dnl
])
elif test $pkg_failed = untried; then
AC_MSG_RESULT([no])
@@ -1431,7 +1433,7 @@
_PKG_TEXT
-To get pkg-config, see .])
+To get pkg-config, see .])[]dnl
])
else
$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
diff -Nru devhelp-3.4.0/build-aux/compile devhelp-3.4.1/build-aux/compile
--- devhelp-3.4.0/build-aux/compile 2012-03-27 02:55:15.000000000 +0000
+++ devhelp-3.4.1/build-aux/compile 2012-04-16 11:55:30.000000000 +0000
@@ -1,7 +1,7 @@
#! /bin/sh
# Wrapper for compilers which do not understand '-c -o'.
-scriptversion=2012-01-04.17; # UTC
+scriptversion=2012-03-05.13; # UTC
# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2009, 2010, 2012 Free
# Software Foundation, Inc.
@@ -79,6 +79,48 @@
esac
}
+# func_cl_dashL linkdir
+# Make cl look for libraries in LINKDIR
+func_cl_dashL ()
+{
+ func_file_conv "$1"
+ if test -z "$lib_path"; then
+ lib_path=$file
+ else
+ lib_path="$lib_path;$file"
+ fi
+ linker_opts="$linker_opts -LIBPATH:$file"
+}
+
+# func_cl_dashl library
+# Do a library search-path lookup for cl
+func_cl_dashl ()
+{
+ lib=$1
+ found=no
+ save_IFS=$IFS
+ IFS=';'
+ for dir in $lib_path $LIB
+ do
+ IFS=$save_IFS
+ if $shared && test -f "$dir/$lib.dll.lib"; then
+ found=yes
+ lib=$dir/$lib.dll.lib
+ break
+ fi
+ if test -f "$dir/$lib.lib"; then
+ found=yes
+ lib=$dir/$lib.lib
+ break
+ fi
+ done
+ IFS=$save_IFS
+
+ if test "$found" != yes; then
+ lib=$lib.lib
+ fi
+}
+
# func_cl_wrapper cl arg...
# Adjust compile command to suit cl
func_cl_wrapper ()
@@ -109,43 +151,34 @@
;;
esac
;;
+ -I)
+ eat=1
+ func_file_conv "$2" mingw
+ set x "$@" -I"$file"
+ shift
+ ;;
-I*)
func_file_conv "${1#-I}" mingw
set x "$@" -I"$file"
shift
;;
+ -l)
+ eat=1
+ func_cl_dashl "$2"
+ set x "$@" "$lib"
+ shift
+ ;;
-l*)
- lib=${1#-l}
- found=no
- save_IFS=$IFS
- IFS=';'
- for dir in $lib_path $LIB
- do
- IFS=$save_IFS
- if $shared && test -f "$dir/$lib.dll.lib"; then
- found=yes
- set x "$@" "$dir/$lib.dll.lib"
- break
- fi
- if test -f "$dir/$lib.lib"; then
- found=yes
- set x "$@" "$dir/$lib.lib"
- break
- fi
- done
- IFS=$save_IFS
-
- test "$found" != yes && set x "$@" "$lib.lib"
+ func_cl_dashl "${1#-l}"
+ set x "$@" "$lib"
shift
;;
+ -L)
+ eat=1
+ func_cl_dashL "$2"
+ ;;
-L*)
- func_file_conv "${1#-L}"
- if test -z "$lib_path"; then
- lib_path=$file
- else
- lib_path="$lib_path;$file"
- fi
- linker_opts="$linker_opts -LIBPATH:$file"
+ func_cl_dashL "${1#-L}"
;;
-static)
shared=false
diff -Nru devhelp-3.4.0/build-aux/config.guess devhelp-3.4.1/build-aux/config.guess
--- devhelp-3.4.0/build-aux/config.guess 2012-03-27 02:55:15.000000000 +0000
+++ devhelp-3.4.1/build-aux/config.guess 2012-04-16 11:55:30.000000000 +0000
@@ -4,7 +4,7 @@
# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
# 2011, 2012 Free Software Foundation, Inc.
-timestamp='2012-01-01'
+timestamp='2012-02-10'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -17,9 +17,7 @@
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with this program; if not, see .
#
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
@@ -863,6 +861,13 @@
i*86:Minix:*:*)
echo ${UNAME_MACHINE}-pc-minix
exit ;;
+ aarch64:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ exit ;;
+ aarch64_be:Linux:*:*)
+ UNAME_MACHINE=aarch64_be
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ exit ;;
alpha:Linux:*:*)
case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
EV5) UNAME_MACHINE=alphaev5 ;;
@@ -1320,6 +1325,9 @@
i*86:AROS:*:*)
echo ${UNAME_MACHINE}-pc-aros
exit ;;
+ x86_64:VMkernel:*:*)
+ echo ${UNAME_MACHINE}-unknown-esx
+ exit ;;
esac
#echo '(No uname command or uname output not recognized.)' 1>&2
diff -Nru devhelp-3.4.0/build-aux/config.sub devhelp-3.4.1/build-aux/config.sub
--- devhelp-3.4.0/build-aux/config.sub 2012-03-27 02:55:15.000000000 +0000
+++ devhelp-3.4.1/build-aux/config.sub 2012-04-16 11:55:30.000000000 +0000
@@ -4,7 +4,7 @@
# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
# 2011, 2012 Free Software Foundation, Inc.
-timestamp='2012-01-01'
+timestamp='2012-02-10'
# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
@@ -21,9 +21,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with this program; if not, see .
#
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
@@ -132,6 +130,10 @@
os=-$maybe_os
basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
;;
+ android-linux)
+ os=-linux-android
+ basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
+ ;;
*)
basic_machine=`echo $1 | sed 's/-[^-]*$//'`
if [ $basic_machine != $1 ]
@@ -247,6 +249,7 @@
# Some are omitted here because they have special meanings below.
1750a | 580 \
| a29k \
+ | aarch64 | aarch64_be \
| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
| am33_2.0 \
@@ -319,7 +322,7 @@
c6x)
basic_machine=tic6x-unknown
;;
- m6811 | m68hc11 | m6812 | m68hc12 | picochip)
+ m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip)
basic_machine=$basic_machine-unknown
os=-none
;;
@@ -332,7 +335,10 @@
strongarm | thumb | xscale)
basic_machine=arm-unknown
;;
-
+ xgate)
+ basic_machine=$basic_machine-unknown
+ os=-none
+ ;;
xscaleeb)
basic_machine=armeb-unknown
;;
@@ -355,6 +361,7 @@
# Recognize the basic CPU types with company name.
580-* \
| a29k-* \
+ | aarch64-* | aarch64_be-* \
| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
diff -Nru devhelp-3.4.0/build-aux/depcomp devhelp-3.4.1/build-aux/depcomp
--- devhelp-3.4.0/build-aux/depcomp 2012-03-27 02:55:15.000000000 +0000
+++ devhelp-3.4.1/build-aux/depcomp 2012-04-16 11:55:30.000000000 +0000
@@ -1,10 +1,10 @@
#! /bin/sh
# depcomp - compile a program generating dependencies as side-effects
-scriptversion=2011-12-04.11; # UTC
+scriptversion=2012-03-27.16; # UTC
# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009, 2010,
-# 2011 Free Software Foundation, Inc.
+# 2011, 2012 Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -28,7 +28,7 @@
case $1 in
'')
- echo "$0: No command. Try \`$0 --help' for more information." 1>&2
+ echo "$0: No command. Try '$0 --help' for more information." 1>&2
exit 1;
;;
-h | --h*)
@@ -40,8 +40,8 @@
Environment variables:
depmode Dependency tracking mode.
- source Source file read by `PROGRAMS ARGS'.
- object Object file output by `PROGRAMS ARGS'.
+ source Source file read by 'PROGRAMS ARGS'.
+ object Object file output by 'PROGRAMS ARGS'.
DEPDIR directory where to store dependencies.
depfile Dependency file to output.
tmpdepfile Temporary file to use when outputting dependencies.
@@ -57,6 +57,12 @@
;;
esac
+# A tabulation character.
+tab=' '
+# A newline character.
+nl='
+'
+
if test -z "$depmode" || test -z "$source" || test -z "$object"; then
echo "depcomp: Variables source, object and depmode must be set" 1>&2
exit 1
@@ -102,6 +108,12 @@
depmode=msvc7
fi
+if test "$depmode" = xlc; then
+ # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency informations.
+ gccflag=-qmakedep=gcc,-MF
+ depmode=gcc
+fi
+
case "$depmode" in
gcc3)
## gcc 3 implements dependency tracking that does exactly what
@@ -156,15 +168,14 @@
## The second -e expression handles DOS-style file names with drive letters.
sed -e 's/^[^:]*: / /' \
-e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile"
-## This next piece of magic avoids the `deleted header file' problem.
+## This next piece of magic avoids the "deleted header file" problem.
## The problem is that when a header file which appears in a .P file
## is deleted, the dependency causes make to die (because there is
## typically no way to rebuild the header). We avoid this by adding
## dummy dependencies for each header file. Too bad gcc doesn't do
## this for us directly.
- tr ' ' '
-' < "$tmpdepfile" |
-## Some versions of gcc put a space before the `:'. On the theory
+ tr ' ' "$nl" < "$tmpdepfile" |
+## Some versions of gcc put a space before the ':'. On the theory
## that the space means something, we add a space to the output as
## well. hp depmode also adds that space, but also prefixes the VPATH
## to the object. Take care to not repeat it in the output.
@@ -203,18 +214,15 @@
# clever and replace this with sed code, as IRIX sed won't handle
# lines with more than a fixed number of characters (4096 in
# IRIX 6.2 sed, 8192 in IRIX 6.5). We also remove comment lines;
- # the IRIX cc adds comments like `#:fec' to the end of the
+ # the IRIX cc adds comments like '#:fec' to the end of the
# dependency line.
- tr ' ' '
-' < "$tmpdepfile" \
+ tr ' ' "$nl" < "$tmpdepfile" \
| sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \
- tr '
-' ' ' >> "$depfile"
+ tr "$nl" ' ' >> "$depfile"
echo >> "$depfile"
# The second pass generates a dummy entry for each header file.
- tr ' ' '
-' < "$tmpdepfile" \
+ tr ' ' "$nl" < "$tmpdepfile" \
| sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
>> "$depfile"
else
@@ -226,10 +234,17 @@
rm -f "$tmpdepfile"
;;
+xlc)
+ # This case exists only to let depend.m4 do its work. It works by
+ # looking at the text of this script. This case will never be run,
+ # since it is checked for above.
+ exit 1
+ ;;
+
aix)
# The C for AIX Compiler uses -M and outputs the dependencies
# in a .u file. In older versions, this file always lives in the
- # current directory. Also, the AIX compiler puts `$object:' at the
+ # current directory. Also, the AIX compiler puts '$object:' at the
# start of each line; $object doesn't have directory information.
# Version 6 uses the directory in both cases.
dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
@@ -259,12 +274,11 @@
test -f "$tmpdepfile" && break
done
if test -f "$tmpdepfile"; then
- # Each line is of the form `foo.o: dependent.h'.
+ # Each line is of the form 'foo.o: dependent.h'.
# Do two passes, one to just change these to
- # `$object: dependent.h' and one to simply `dependent.h:'.
+ # '$object: dependent.h' and one to simply 'dependent.h:'.
sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
- # That's a tab and a space in the [].
- sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
+ sed -e 's,^.*\.[a-z]*:['"$tab"' ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
else
# The sourcefile does not contain any dependencies, so just
# store a dummy comment line, to avoid errors with the Makefile
@@ -275,23 +289,26 @@
;;
icc)
- # Intel's C compiler understands `-MD -MF file'. However on
- # icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c
+ # Intel's C compiler anf tcc (Tiny C Compiler) understand '-MD -MF file'.
+ # However on
+ # $CC -MD -MF foo.d -c -o sub/foo.o sub/foo.c
# ICC 7.0 will fill foo.d with something like
# foo.o: sub/foo.c
# foo.o: sub/foo.h
- # which is wrong. We want:
+ # which is wrong. We want
# sub/foo.o: sub/foo.c
# sub/foo.o: sub/foo.h
# sub/foo.c:
# sub/foo.h:
# ICC 7.1 will output
# foo.o: sub/foo.c sub/foo.h
- # and will wrap long lines using \ :
+ # and will wrap long lines using '\':
# foo.o: sub/foo.c ... \
# sub/foo.h ... \
# ...
-
+ # tcc 0.9.26 (FIXME still under development at the moment of writing)
+ # will emit a similar output, but also prepend the continuation lines
+ # with horizontal tabulation characters.
"$@" -MD -MF "$tmpdepfile"
stat=$?
if test $stat -eq 0; then :
@@ -300,15 +317,21 @@
exit $stat
fi
rm -f "$depfile"
- # Each line is of the form `foo.o: dependent.h',
- # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'.
+ # Each line is of the form 'foo.o: dependent.h',
+ # or 'foo.o: dep1.h dep2.h \', or ' dep3.h dep4.h \'.
# Do two passes, one to just change these to
- # `$object: dependent.h' and one to simply `dependent.h:'.
- sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile"
- # Some versions of the HPUX 10.20 sed can't process this invocation
- # correctly. Breaking it into two sed invocations is a workaround.
- sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" |
- sed -e 's/$/ :/' >> "$depfile"
+ # '$object: dependent.h' and one to simply 'dependent.h:'.
+ sed -e "s/^[ $tab][ $tab]*/ /" -e "s,^[^:]*:,$object :," \
+ < "$tmpdepfile" > "$depfile"
+ sed '
+ s/[ '"$tab"'][ '"$tab"']*/ /g
+ s/^ *//
+ s/ *\\*$//
+ s/^[^:]*: *//
+ /^$/d
+ /:$/d
+ s/$/ :/
+ ' < "$tmpdepfile" >> "$depfile"
rm -f "$tmpdepfile"
;;
@@ -344,7 +367,7 @@
done
if test -f "$tmpdepfile"; then
sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile"
- # Add `dependent.h:' lines.
+ # Add 'dependent.h:' lines.
sed -ne '2,${
s/^ *//
s/ \\*$//
@@ -359,9 +382,9 @@
tru64)
# The Tru64 compiler uses -MD to generate dependencies as a side
- # effect. `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'.
+ # effect. 'cc -MD -o foo.o ...' puts the dependencies into 'foo.o.d'.
# At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
- # dependencies in `foo.d' instead, so we check for that too.
+ # dependencies in 'foo.d' instead, so we check for that too.
# Subdirectories are respected.
dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
test "x$dir" = "x$object" && dir=
@@ -407,8 +430,7 @@
done
if test -f "$tmpdepfile"; then
sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
- # That's a tab and a space in the [].
- sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
+ sed -e 's,^.*\.[a-z]*:['"$tab"' ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
else
echo "#dummy" > "$depfile"
fi
@@ -443,11 +465,11 @@
p
}' | $cygpath_u | sort -u | sed -n '
s/ /\\ /g
-s/\(.*\)/ \1 \\/p
+s/\(.*\)/'"$tab"'\1 \\/p
s/.\(.*\) \\/\1:/
H
$ {
- s/.*/ /
+ s/.*/'"$tab"'/
G
p
}' >> "$depfile"
@@ -478,7 +500,7 @@
shift
fi
- # Remove `-o $object'.
+ # Remove '-o $object'.
IFS=" "
for arg
do
@@ -498,15 +520,14 @@
done
test -z "$dashmflag" && dashmflag=-M
- # Require at least two characters before searching for `:'
+ # Require at least two characters before searching for ':'
# in the target name. This is to cope with DOS-style filenames:
- # a dependency such as `c:/foo/bar' could be seen as target `c' otherwise.
+ # a dependency such as 'c:/foo/bar' could be seen as target 'c' otherwise.
"$@" $dashmflag |
- sed 's:^[ ]*[^: ][^:][^:]*\:[ ]*:'"$object"'\: :' > "$tmpdepfile"
+ sed 's:^['"$tab"' ]*[^:'"$tab"' ][^:][^:]*\:['"$tab"' ]*:'"$object"'\: :' > "$tmpdepfile"
rm -f "$depfile"
cat < "$tmpdepfile" > "$depfile"
- tr ' ' '
-' < "$tmpdepfile" | \
+ tr ' ' "$nl" < "$tmpdepfile" | \
## Some versions of the HPUX 10.20 sed can't process this invocation
## correctly. Breaking it into two sed invocations is a workaround.
sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
@@ -562,8 +583,7 @@
# makedepend may prepend the VPATH from the source file name to the object.
# No need to regex-escape $object, excess matching of '.' is harmless.
sed "s|^.*\($object *:\)|\1|" "$tmpdepfile" > "$depfile"
- sed '1,2d' "$tmpdepfile" | tr ' ' '
-' | \
+ sed '1,2d' "$tmpdepfile" | tr ' ' "$nl" | \
## Some versions of the HPUX 10.20 sed can't process this invocation
## correctly. Breaking it into two sed invocations is a workaround.
sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
@@ -583,7 +603,7 @@
shift
fi
- # Remove `-o $object'.
+ # Remove '-o $object'.
IFS=" "
for arg
do
@@ -652,8 +672,8 @@
sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::\1:p' | $cygpath_u | sort -u > "$tmpdepfile"
rm -f "$depfile"
echo "$object : \\" > "$depfile"
- sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s:: \1 \\:p' >> "$depfile"
- echo " " >> "$depfile"
+ sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::'"$tab"'\1 \\:p' >> "$depfile"
+ echo "$tab" >> "$depfile"
sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::\1\::p' >> "$depfile"
rm -f "$tmpdepfile"
;;
diff -Nru devhelp-3.4.0/build-aux/ltmain.sh devhelp-3.4.1/build-aux/ltmain.sh
--- devhelp-3.4.0/build-aux/ltmain.sh 2012-03-27 02:55:11.000000000 +0000
+++ devhelp-3.4.1/build-aux/ltmain.sh 2012-04-16 11:55:21.000000000 +0000
@@ -70,7 +70,7 @@
# compiler: $LTCC
# compiler flags: $LTCFLAGS
# linker: $LD (gnu? $with_gnu_ld)
-# $progname: (GNU libtool) 2.4.2
+# $progname: (GNU libtool) 2.4.2 Debian-2.4.2-1
# automake: $automake_version
# autoconf: $autoconf_version
#
@@ -80,7 +80,7 @@
PROGRAM=libtool
PACKAGE=libtool
-VERSION=2.4.2
+VERSION="2.4.2 Debian-2.4.2-1"
TIMESTAMP=""
package_revision=1.3337
@@ -6124,7 +6124,10 @@
case $pass in
dlopen) libs="$dlfiles" ;;
dlpreopen) libs="$dlprefiles" ;;
- link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;
+ link)
+ libs="$deplibs %DEPLIBS%"
+ test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs"
+ ;;
esac
fi
if test "$linkmode,$pass" = "lib,dlpreopen"; then
@@ -6444,19 +6447,19 @@
# It is a libtool convenience library, so add in its objects.
func_append convenience " $ladir/$objdir/$old_library"
func_append old_convenience " $ladir/$objdir/$old_library"
+ tmp_libs=
+ for deplib in $dependency_libs; do
+ deplibs="$deplib $deplibs"
+ if $opt_preserve_dup_deps ; then
+ case "$tmp_libs " in
+ *" $deplib "*) func_append specialdeplibs " $deplib" ;;
+ esac
+ fi
+ func_append tmp_libs " $deplib"
+ done
elif test "$linkmode" != prog && test "$linkmode" != lib; then
func_fatal_error "\`$lib' is not a convenience library"
fi
- tmp_libs=
- for deplib in $dependency_libs; do
- deplibs="$deplib $deplibs"
- if $opt_preserve_dup_deps ; then
- case "$tmp_libs " in
- *" $deplib "*) func_append specialdeplibs " $deplib" ;;
- esac
- fi
- func_append tmp_libs " $deplib"
- done
continue
fi # $pass = conv
@@ -7349,6 +7352,9 @@
revision="$number_minor"
lt_irix_increment=no
;;
+ *)
+ func_fatal_configuration "$modename: unknown library version type \`$version_type'"
+ ;;
esac
;;
no)
diff -Nru devhelp-3.4.0/configure devhelp-3.4.1/configure
--- devhelp-3.4.0/configure 2012-03-27 02:55:14.000000000 +0000
+++ devhelp-3.4.1/configure 2012-04-16 11:55:28.000000000 +0000
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for Devhelp 3.4.0.
+# Generated by GNU Autoconf 2.68 for Devhelp 3.4.1.
#
# Report bugs to .
#
@@ -571,8 +571,8 @@
# Identity of this package.
PACKAGE_NAME='Devhelp'
PACKAGE_TARNAME='devhelp'
-PACKAGE_VERSION='3.4.0'
-PACKAGE_STRING='Devhelp 3.4.0'
+PACKAGE_VERSION='3.4.1'
+PACKAGE_STRING='Devhelp 3.4.1'
PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=devhelp'
PACKAGE_URL='http://live.gnome.org/devhelp'
@@ -1391,7 +1391,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures Devhelp 3.4.0 to adapt to many kinds of systems.
+\`configure' configures Devhelp 3.4.1 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1461,7 +1461,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of Devhelp 3.4.0:";;
+ short | recursive ) echo "Configuration of Devhelp 3.4.1:";;
esac
cat <<\_ACEOF
@@ -1597,7 +1597,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-Devhelp configure 3.4.0
+Devhelp configure 3.4.1
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1966,7 +1966,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by Devhelp $as_me 3.4.0, which was
+It was created by Devhelp $as_me 3.4.1, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -2800,7 +2800,7 @@
# Define the identity of the package.
PACKAGE='devhelp'
- VERSION='3.4.0'
+ VERSION='3.4.1'
# Some tools Automake needs.
@@ -5536,7 +5536,7 @@
lt_cv_deplibs_check_method=pass_all
;;
-netbsd*)
+netbsd* | netbsdelf*-gnu)
if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
else
@@ -8799,6 +8799,9 @@
openbsd*)
with_gnu_ld=no
;;
+ linux* | k*bsd*-gnu | gnu*)
+ link_all_deplibs=no
+ ;;
esac
ld_shlibs=yes
@@ -9020,7 +9023,7 @@
fi
;;
- netbsd*)
+ netbsd* | netbsdelf*-gnu)
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
@@ -9197,6 +9200,7 @@
if test "$aix_use_runtimelinking" = yes; then
shared_flag="$shared_flag "'${wl}-G'
fi
+ link_all_deplibs=no
else
# not using gcc
if test "$host_cpu" = ia64; then
@@ -9650,7 +9654,7 @@
link_all_deplibs=yes
;;
- netbsd*)
+ netbsd* | netbsdelf*-gnu)
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
@@ -10663,14 +10667,10 @@
# before this can be enabled.
hardcode_into_libs=yes
- # Add ABI-specific directories to the system library path.
- sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
-
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
- sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
-
+ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
@@ -10682,6 +10682,18 @@
dynamic_linker='GNU/Linux ld.so'
;;
+netbsdelf*-gnu)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=no
+ hardcode_into_libs=yes
+ dynamic_linker='NetBSD ld.elf_so'
+ ;;
+
netbsd*)
version_type=sunos
need_lib_prefix=no
@@ -11660,6 +11672,7 @@
+
if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
@@ -12067,6 +12080,7 @@
$WEBKITGTK_PC_NAME >= $WEBKITGTK_REQUIRED_VERSION
glib-2.0 >= 2.25.11
" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
fi
@@ -12098,6 +12112,7 @@
$WEBKITGTK_PC_NAME >= $WEBKITGTK_REQUIRED_VERSION
glib-2.0 >= 2.25.11
" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
fi
@@ -12117,14 +12132,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- DEVHELP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "
+ DEVHELP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "
gthread-2.0 >= 2.10.0
gtk+-3.0 >= 3.0.2
$WEBKITGTK_PC_NAME >= $WEBKITGTK_REQUIRED_VERSION
glib-2.0 >= 2.25.11
" 2>&1`
else
- DEVHELP_PKG_ERRORS=`$PKG_CONFIG --print-errors "
+ DEVHELP_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "
gthread-2.0 >= 2.10.0
gtk+-3.0 >= 3.0.2
$WEBKITGTK_PC_NAME >= $WEBKITGTK_REQUIRED_VERSION
@@ -12149,7 +12164,6 @@
Alternatively, you may set the environment variables DEVHELP_CFLAGS
and DEVHELP_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details." "$LINENO" 5
-
elif test $pkg_failed = untried; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
@@ -12165,7 +12179,6 @@
To get pkg-config, see .
See \`config.log' for more details" "$LINENO" 5; }
-
else
DEVHELP_CFLAGS=$pkg_cv_DEVHELP_CFLAGS
DEVHELP_LIBS=$pkg_cv_DEVHELP_LIBS
@@ -12204,6 +12217,7 @@
$gtkmacintegration_pkgconfig
$WEBKITGTK_PC_NAME >= $WEBKITGTK_REQUIRED_VERSION
" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
fi
@@ -12235,6 +12249,7 @@
$gtkmacintegration_pkgconfig
$WEBKITGTK_PC_NAME >= $WEBKITGTK_REQUIRED_VERSION
" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
fi
@@ -12254,14 +12269,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- LIBDEVHELP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "
+ LIBDEVHELP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "
gtk+-3.0 >= 3.0.2
$gconf_pkgconfig
$gtkmacintegration_pkgconfig
$WEBKITGTK_PC_NAME >= $WEBKITGTK_REQUIRED_VERSION
" 2>&1`
else
- LIBDEVHELP_PKG_ERRORS=`$PKG_CONFIG --print-errors "
+ LIBDEVHELP_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "
gtk+-3.0 >= 3.0.2
$gconf_pkgconfig
$gtkmacintegration_pkgconfig
@@ -12286,7 +12301,6 @@
Alternatively, you may set the environment variables LIBDEVHELP_CFLAGS
and LIBDEVHELP_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details." "$LINENO" 5
-
elif test $pkg_failed = untried; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
@@ -12302,7 +12316,6 @@
To get pkg-config, see .
See \`config.log' for more details" "$LINENO" 5; }
-
else
LIBDEVHELP_CFLAGS=$pkg_cv_LIBDEVHELP_CFLAGS
LIBDEVHELP_LIBS=$pkg_cv_LIBDEVHELP_LIBS
@@ -15712,7 +15725,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by Devhelp $as_me 3.4.0, which was
+This file was extended by Devhelp $as_me 3.4.1, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -15779,7 +15792,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-Devhelp config.status 3.4.0
+Devhelp config.status 3.4.1
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
diff -Nru devhelp-3.4.0/configure.ac devhelp-3.4.1/configure.ac
--- devhelp-3.4.0/configure.ac 2012-03-27 02:54:56.000000000 +0000
+++ devhelp-3.4.1/configure.ac 2012-04-16 11:34:42.000000000 +0000
@@ -1,6 +1,6 @@
AC_PREREQ([2.64])
AC_INIT([Devhelp],
- [3.4.0],
+ [3.4.1],
[http://bugzilla.gnome.org/enter_bug.cgi?product=devhelp],
[devhelp],
[http://live.gnome.org/devhelp])
diff -Nru devhelp-3.4.0/contrib/Makefile.in devhelp-3.4.1/contrib/Makefile.in
--- devhelp-3.4.0/contrib/Makefile.in 2012-03-27 02:55:15.000000000 +0000
+++ devhelp-3.4.1/contrib/Makefile.in 2012-04-16 11:55:30.000000000 +0000
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
+# Makefile.in generated by automake 1.11.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -15,6 +15,23 @@
@SET_MAKE@
VPATH = @srcdir@
+am__make_dryrun = \
+ { \
+ am__dry=no; \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
+ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+ *) \
+ for am__flg in $$MAKEFLAGS; do \
+ case $$am__flg in \
+ *=*|--*) ;; \
+ *n*) am__dry=yes; break;; \
+ esac; \
+ done;; \
+ esac; \
+ test $$am__dry = yes; \
+ }
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -59,6 +76,11 @@
am__v_at_0 = @
SOURCES =
DIST_SOURCES =
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@
diff -Nru devhelp-3.4.0/data/devhelp.desktop.in devhelp-3.4.1/data/devhelp.desktop.in
--- devhelp-3.4.0/data/devhelp.desktop.in 2012-03-27 02:55:19.000000000 +0000
+++ devhelp-3.4.1/data/devhelp.desktop.in 2012-04-16 11:55:45.000000000 +0000
@@ -11,4 +11,4 @@
X-GNOME-Bugzilla-Bugzilla=GNOME
X-GNOME-Bugzilla-Product=devhelp
X-GNOME-Bugzilla-Component=General
-X-GNOME-Bugzilla-Version=3.4.0
+X-GNOME-Bugzilla-Version=3.4.1
diff -Nru devhelp-3.4.0/data/devhelp.schemas devhelp-3.4.1/data/devhelp.schemas
--- devhelp-3.4.0/data/devhelp.schemas 2012-03-27 02:55:36.000000000 +0000
+++ devhelp-3.4.1/data/devhelp.schemas 2012-04-16 11:57:45.000000000 +0000
@@ -509,6 +509,11 @@
The width of the main window.
+
+ मुख्य विंडो की चौड़ाई
+ मुख्य विंडो की चौड़ाई.
+
+
Širina glavnog prozora.
@@ -881,6 +886,11 @@
The height of the main window.
+
+ मुख्य विंडो की ऊँचाई
+ मुख्य विंडो की ऊँचाई.
+
+
Visina glavnog prozora.
@@ -1252,6 +1262,11 @@
The X position of the main window.
+
+ मुख्य विंडो के X स्थिति
+ मुख्य विंडो की X स्थिति.
+
+
Főablak X-pozíciója
A főablak X-pozíciója.
@@ -1608,6 +1623,11 @@
The Y position of the main window.
+
+ मुख्य विंडो के Y स्थिति
+ मुख्य विंडो की Y स्थिति.
+
+
Főablak Y-pozíciója
A főablak Y-pozíciója.
@@ -1950,6 +1970,11 @@
The width of the assistant window.
+
+ सहायक विंडो की चौड़ाई
+ सहायक विंडो की चौड़ाई.
+
+
Asszisztensablak szélessége
Az asszisztensablak szélessége.
@@ -2241,6 +2266,11 @@
The height of the assistant window.
+
+ सहायक विंडो की ऊंचाई
+ सहायक विंडो की ऊँचाई.
+
+
Asszisztensablak magassága
Az asszisztensablak magassága.
@@ -2532,6 +2562,11 @@
The X position of the assistant window.
+
+ सहायक विंडो के X स्थिति
+ सहायक विंडो की X स्थिति.
+
+
Asszisztensablak X-pozíciója
Az asszisztensablak X-pozíciója.
@@ -2823,6 +2858,11 @@
The Y position of the assistant window.
+
+ सहायक विंडो के Y स्थिति
+ सहायक विंडो की Y स्थिति.
+
+
Asszisztensablak Y-pozíciója
Az asszisztensablak Y-pozíciója.
@@ -3130,6 +3170,11 @@
The width of the index and search pane.
+
+ सूचकांक और खोज फलक की चौड़ाई
+ सूचकांक और खोज फलक की चौड़ाई.
+
+
Az index és a kereső oldalsáv szélessége
Az index és a kereső oldalsáv szélessége.
@@ -4299,6 +4344,11 @@
Use the system default fonts.
+
+ प्रणाली फोंट का प्रयोग करें
+ सिस्टम डिफ़ॉल्ट फ़ॉन्ट का प्रयोग करें.
+
+
A rendszer betűkészletének használata
A rendszer alapértelmezett betűkészleteinek használata.
@@ -4665,6 +4715,11 @@
Font for text with variable width.
+
+ पाठ के लिए फ़ॉन्ट
+ परिवर्तनीय चौड़ाई के साथ पाठ के लिए फ़ॉन्ट.
+
+
Szöveg betűkészlete
Változó szélességű szöveg betűkészlete.
@@ -5016,6 +5071,11 @@
Font for text with fixed width, such as code examples.
+
+ स्थिर चौड़ाई पाठ के लिए फ़ॉन्ट
+ कोड उदाहरण के रूप में, फिक्स्ड चौड़ाई के साथ पाठ के लिए फ़ॉन्ट.
+
+
Rögzített szélességű szöveg betűkészlete
Rögzített szélességű szöveg, mint a példakódok betűkészlete.
diff -Nru devhelp-3.4.0/data/dtd/Makefile.in devhelp-3.4.1/data/dtd/Makefile.in
--- devhelp-3.4.0/data/dtd/Makefile.in 2012-03-27 02:55:15.000000000 +0000
+++ devhelp-3.4.1/data/dtd/Makefile.in 2012-04-16 11:55:30.000000000 +0000
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
+# Makefile.in generated by automake 1.11.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -16,6 +16,23 @@
@SET_MAKE@
VPATH = @srcdir@
+am__make_dryrun = \
+ { \
+ am__dry=no; \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
+ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+ *) \
+ for am__flg in $$MAKEFLAGS; do \
+ case $$am__flg in \
+ *=*|--*) ;; \
+ *n*) am__dry=yes; break;; \
+ esac; \
+ done;; \
+ esac; \
+ test $$am__dry = yes; \
+ }
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -60,6 +77,11 @@
am__v_at_0 = @
SOURCES =
DIST_SOURCES =
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -301,8 +323,11 @@
-rm -rf .libs _libs
install-dtdDATA: $(dtd_DATA)
@$(NORMAL_INSTALL)
- test -z "$(dtddir)" || $(MKDIR_P) "$(DESTDIR)$(dtddir)"
@list='$(dtd_DATA)'; test -n "$(dtddir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(dtddir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(dtddir)" || exit 1; \
+ fi; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
diff -Nru devhelp-3.4.0/data/icons/Makefile.in devhelp-3.4.1/data/icons/Makefile.in
--- devhelp-3.4.0/data/icons/Makefile.in 2012-03-27 02:55:15.000000000 +0000
+++ devhelp-3.4.1/data/icons/Makefile.in 2012-04-16 11:55:30.000000000 +0000
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
+# Makefile.in generated by automake 1.11.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -16,6 +16,23 @@
@SET_MAKE@
VPATH = @srcdir@
+am__make_dryrun = \
+ { \
+ am__dry=no; \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
+ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+ *) \
+ for am__flg in $$MAKEFLAGS; do \
+ case $$am__flg in \
+ *=*|--*) ;; \
+ *n*) am__dry=yes; break;; \
+ esac; \
+ done;; \
+ esac; \
+ test $$am__dry = yes; \
+ }
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -60,6 +77,11 @@
am__v_at_0 = @
SOURCES =
DIST_SOURCES =
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -321,8 +343,11 @@
-rm -rf .libs _libs
install-icon16DATA: $(icon16_DATA)
@$(NORMAL_INSTALL)
- test -z "$(icon16dir)" || $(MKDIR_P) "$(DESTDIR)$(icon16dir)"
@list='$(icon16_DATA)'; test -n "$(icon16dir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(icon16dir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(icon16dir)" || exit 1; \
+ fi; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
@@ -339,8 +364,11 @@
dir='$(DESTDIR)$(icon16dir)'; $(am__uninstall_files_from_dir)
install-icon22DATA: $(icon22_DATA)
@$(NORMAL_INSTALL)
- test -z "$(icon22dir)" || $(MKDIR_P) "$(DESTDIR)$(icon22dir)"
@list='$(icon22_DATA)'; test -n "$(icon22dir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(icon22dir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(icon22dir)" || exit 1; \
+ fi; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
@@ -357,8 +385,11 @@
dir='$(DESTDIR)$(icon22dir)'; $(am__uninstall_files_from_dir)
install-icon24DATA: $(icon24_DATA)
@$(NORMAL_INSTALL)
- test -z "$(icon24dir)" || $(MKDIR_P) "$(DESTDIR)$(icon24dir)"
@list='$(icon24_DATA)'; test -n "$(icon24dir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(icon24dir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(icon24dir)" || exit 1; \
+ fi; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
@@ -375,8 +406,11 @@
dir='$(DESTDIR)$(icon24dir)'; $(am__uninstall_files_from_dir)
install-icon256DATA: $(icon256_DATA)
@$(NORMAL_INSTALL)
- test -z "$(icon256dir)" || $(MKDIR_P) "$(DESTDIR)$(icon256dir)"
@list='$(icon256_DATA)'; test -n "$(icon256dir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(icon256dir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(icon256dir)" || exit 1; \
+ fi; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
@@ -393,8 +427,11 @@
dir='$(DESTDIR)$(icon256dir)'; $(am__uninstall_files_from_dir)
install-icon32DATA: $(icon32_DATA)
@$(NORMAL_INSTALL)
- test -z "$(icon32dir)" || $(MKDIR_P) "$(DESTDIR)$(icon32dir)"
@list='$(icon32_DATA)'; test -n "$(icon32dir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(icon32dir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(icon32dir)" || exit 1; \
+ fi; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
@@ -411,8 +448,11 @@
dir='$(DESTDIR)$(icon32dir)'; $(am__uninstall_files_from_dir)
install-icon48DATA: $(icon48_DATA)
@$(NORMAL_INSTALL)
- test -z "$(icon48dir)" || $(MKDIR_P) "$(DESTDIR)$(icon48dir)"
@list='$(icon48_DATA)'; test -n "$(icon48dir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(icon48dir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(icon48dir)" || exit 1; \
+ fi; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
diff -Nru devhelp-3.4.0/data/Makefile.in devhelp-3.4.1/data/Makefile.in
--- devhelp-3.4.0/data/Makefile.in 2012-03-27 02:55:15.000000000 +0000
+++ devhelp-3.4.1/data/Makefile.in 2012-04-16 11:55:30.000000000 +0000
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
+# Makefile.in generated by automake 1.11.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -16,6 +16,23 @@
@SET_MAKE@
VPATH = @srcdir@
+am__make_dryrun = \
+ { \
+ am__dry=no; \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
+ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+ *) \
+ for am__flg in $$MAKEFLAGS; do \
+ case $$am__flg in \
+ *=*|--*) ;; \
+ *n*) am__dry=yes; break;; \
+ esac; \
+ done;; \
+ esac; \
+ test $$am__dry = yes; \
+ }
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -68,6 +85,11 @@
install-pdf-recursive install-ps-recursive install-recursive \
installcheck-recursive installdirs-recursive pdf-recursive \
ps-recursive uninstall-recursive
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -375,8 +397,11 @@
-rm -rf .libs _libs
install-assistantDATA: $(assistant_DATA)
@$(NORMAL_INSTALL)
- test -z "$(assistantdir)" || $(MKDIR_P) "$(DESTDIR)$(assistantdir)"
@list='$(assistant_DATA)'; test -n "$(assistantdir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(assistantdir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(assistantdir)" || exit 1; \
+ fi; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
@@ -393,8 +418,11 @@
dir='$(DESTDIR)$(assistantdir)'; $(am__uninstall_files_from_dir)
install-defaultsDATA: $(defaults_DATA)
@$(NORMAL_INSTALL)
- test -z "$(defaultsdir)" || $(MKDIR_P) "$(DESTDIR)$(defaultsdir)"
@list='$(defaults_DATA)'; test -n "$(defaultsdir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(defaultsdir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(defaultsdir)" || exit 1; \
+ fi; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
@@ -411,8 +439,11 @@
dir='$(DESTDIR)$(defaultsdir)'; $(am__uninstall_files_from_dir)
install-desktopDATA: $(desktop_DATA)
@$(NORMAL_INSTALL)
- test -z "$(desktopdir)" || $(MKDIR_P) "$(DESTDIR)$(desktopdir)"
@list='$(desktop_DATA)'; test -n "$(desktopdir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(desktopdir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(desktopdir)" || exit 1; \
+ fi; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
@@ -429,8 +460,11 @@
dir='$(DESTDIR)$(desktopdir)'; $(am__uninstall_files_from_dir)
install-pkgconfigDATA: $(pkgconfig_DATA)
@$(NORMAL_INSTALL)
- test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)"
@list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(pkgconfigdir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" || exit 1; \
+ fi; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
@@ -447,8 +481,11 @@
dir='$(DESTDIR)$(pkgconfigdir)'; $(am__uninstall_files_from_dir)
install-schemasDATA: $(schemas_DATA)
@$(NORMAL_INSTALL)
- test -z "$(schemasdir)" || $(MKDIR_P) "$(DESTDIR)$(schemasdir)"
@list='$(schemas_DATA)'; test -n "$(schemasdir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(schemasdir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(schemasdir)" || exit 1; \
+ fi; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
@@ -631,13 +668,10 @@
done
@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
- test -d "$(distdir)/$$subdir" \
- || $(MKDIR_P) "$(distdir)/$$subdir" \
- || exit 1; \
- fi; \
- done
- @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
+ $(am__make_dryrun) \
+ || test -d "$(distdir)/$$subdir" \
+ || $(MKDIR_P) "$(distdir)/$$subdir" \
+ || exit 1; \
dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
$(am__relativize); \
new_distdir=$$reldir; \
diff -Nru devhelp-3.4.0/data/ui/Makefile.in devhelp-3.4.1/data/ui/Makefile.in
--- devhelp-3.4.0/data/ui/Makefile.in 2012-03-27 02:55:15.000000000 +0000
+++ devhelp-3.4.1/data/ui/Makefile.in 2012-04-16 11:55:30.000000000 +0000
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
+# Makefile.in generated by automake 1.11.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -16,6 +16,23 @@
@SET_MAKE@
VPATH = @srcdir@
+am__make_dryrun = \
+ { \
+ am__dry=no; \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
+ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+ *) \
+ for am__flg in $$MAKEFLAGS; do \
+ case $$am__flg in \
+ *=*|--*) ;; \
+ *n*) am__dry=yes; break;; \
+ esac; \
+ done;; \
+ esac; \
+ test $$am__dry = yes; \
+ }
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -60,6 +77,11 @@
am__v_at_0 = @
SOURCES =
DIST_SOURCES =
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -302,8 +324,11 @@
-rm -rf .libs _libs
install-uiDATA: $(ui_DATA)
@$(NORMAL_INSTALL)
- test -z "$(uidir)" || $(MKDIR_P) "$(DESTDIR)$(uidir)"
@list='$(ui_DATA)'; test -n "$(uidir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(uidir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(uidir)" || exit 1; \
+ fi; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
diff -Nru devhelp-3.4.0/debian/changelog devhelp-3.4.1/debian/changelog
--- devhelp-3.4.0/debian/changelog 2012-03-27 09:43:39.000000000 +0000
+++ devhelp-3.4.1/debian/changelog 2012-04-16 12:30:54.000000000 +0000
@@ -1,3 +1,10 @@
+devhelp (3.4.1-0ubuntu1) precise-proposed; urgency=low
+
+ * New upstream release:
+ - Translation updates.
+
+ -- Martin Pitt Mon, 16 Apr 2012 14:29:09 +0200
+
devhelp (3.4.0-0ubuntu1) precise-proposed; urgency=low
* New upstream release:
diff -Nru devhelp-3.4.0/m4/libtool.m4 devhelp-3.4.1/m4/libtool.m4
--- devhelp-3.4.0/m4/libtool.m4 2012-03-27 02:55:11.000000000 +0000
+++ devhelp-3.4.1/m4/libtool.m4 2012-04-16 11:55:22.000000000 +0000
@@ -2669,14 +2669,10 @@
# before this can be enabled.
hardcode_into_libs=yes
- # Add ABI-specific directories to the system library path.
- sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
-
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
- sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
-
+ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
@@ -2688,6 +2684,18 @@
dynamic_linker='GNU/Linux ld.so'
;;
+netbsdelf*-gnu)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=no
+ hardcode_into_libs=yes
+ dynamic_linker='NetBSD ld.elf_so'
+ ;;
+
netbsd*)
version_type=sunos
need_lib_prefix=no
@@ -3293,7 +3301,7 @@
lt_cv_deplibs_check_method=pass_all
;;
-netbsd*)
+netbsd* | netbsdelf*-gnu)
if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
else
@@ -4105,7 +4113,7 @@
;;
esac
;;
- netbsd*)
+ netbsd* | netbsdelf*-gnu)
;;
*qnx* | *nto*)
# QNX uses GNU C++, but need to define -shared option too, otherwise
@@ -4582,6 +4590,9 @@
;;
esac
;;
+ linux* | k*bsd*-gnu | gnu*)
+ _LT_TAGVAR(link_all_deplibs, $1)=no
+ ;;
*)
_LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
;;
@@ -4644,6 +4655,9 @@
openbsd*)
with_gnu_ld=no
;;
+ linux* | k*bsd*-gnu | gnu*)
+ _LT_TAGVAR(link_all_deplibs, $1)=no
+ ;;
esac
_LT_TAGVAR(ld_shlibs, $1)=yes
@@ -4865,7 +4879,7 @@
fi
;;
- netbsd*)
+ netbsd* | netbsdelf*-gnu)
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
@@ -5042,6 +5056,7 @@
if test "$aix_use_runtimelinking" = yes; then
shared_flag="$shared_flag "'${wl}-G'
fi
+ _LT_TAGVAR(link_all_deplibs, $1)=no
else
# not using gcc
if test "$host_cpu" = ia64; then
@@ -5346,7 +5361,7 @@
_LT_TAGVAR(link_all_deplibs, $1)=yes
;;
- netbsd*)
+ netbsd* | netbsdelf*-gnu)
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
diff -Nru devhelp-3.4.0/Makefile.in devhelp-3.4.1/Makefile.in
--- devhelp-3.4.0/Makefile.in 2012-03-27 02:55:15.000000000 +0000
+++ devhelp-3.4.1/Makefile.in 2012-04-16 11:55:31.000000000 +0000
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
+# Makefile.in generated by automake 1.11.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -15,6 +15,23 @@
@SET_MAKE@
VPATH = @srcdir@
+am__make_dryrun = \
+ { \
+ am__dry=no; \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
+ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+ *) \
+ for am__flg in $$MAKEFLAGS; do \
+ case $$am__flg in \
+ *=*|--*) ;; \
+ *n*) am__dry=yes; break;; \
+ esac; \
+ done;; \
+ esac; \
+ test $$am__dry = yes; \
+ }
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -74,6 +91,11 @@
install-pdf-recursive install-ps-recursive install-recursive \
installcheck-recursive installdirs-recursive pdf-recursive \
ps-recursive uninstall-recursive
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
distclean-recursive maintainer-clean-recursive
AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
@@ -532,13 +554,10 @@
done
@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
- test -d "$(distdir)/$$subdir" \
- || $(MKDIR_P) "$(distdir)/$$subdir" \
- || exit 1; \
- fi; \
- done
- @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
+ $(am__make_dryrun) \
+ || test -d "$(distdir)/$$subdir" \
+ || $(MKDIR_P) "$(distdir)/$$subdir" \
+ || exit 1; \
dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
$(am__relativize); \
new_distdir=$$reldir; \
diff -Nru devhelp-3.4.0/misc/gedit-plugin/devhelp.desktop devhelp-3.4.1/misc/gedit-plugin/devhelp.desktop
--- devhelp-3.4.0/misc/gedit-plugin/devhelp.desktop 2012-03-27 02:55:36.000000000 +0000
+++ devhelp-3.4.1/misc/gedit-plugin/devhelp.desktop 2012-04-16 11:57:46.000000000 +0000
@@ -31,6 +31,7 @@
Name[gl]=Asistencia de Devhelp
Name[gu]=Devhelp આધાર
Name[he]=תמיכת Devhelp
+Name[hi]=Devhelp समर्थन
Name[hu]=Devhelp támogatás
Name[hy]=Devhelp ապահովում
Name[id]=Dukungan Devhelp
@@ -98,6 +99,7 @@
Description[gl]=Fai que a tecla F2 inicie Devhelp para a palabra onde está o cursor
Description[gu]=F2 એ કર્સર આગળના શબ્દ માટે Devhelp લઈ આવે છે
Description[he]=גורם ל־F2 להעלות את Devhelp עבור המילה תחת הסמן
+Description[hi]=कर्सर पर शब्द के लिएDevhelp को लाने में F2 करता है
Description[hu]=Az F2 hatására megjelenik a Devhelp a kurzornál található szóhoz
Description[hy]=Կանչել Devhelp սեղմելով F2 այն բառի վրա, որտեղ կանգնած է կուրսորը
Description[id]=Dengan tombol F2, membuka Devhelp untuk kata pada kursor
diff -Nru devhelp-3.4.0/misc/gedit-plugin/devhelp.plugin devhelp-3.4.1/misc/gedit-plugin/devhelp.plugin
--- devhelp-3.4.0/misc/gedit-plugin/devhelp.plugin 2012-03-27 02:55:36.000000000 +0000
+++ devhelp-3.4.1/misc/gedit-plugin/devhelp.plugin 2012-04-16 11:57:46.000000000 +0000
@@ -31,6 +31,7 @@
Name[gl]=Asistencia de Devhelp
Name[gu]=Devhelp આધાર
Name[he]=תמיכת Devhelp
+Name[hi]=Devhelp समर्थन
Name[hu]=Devhelp támogatás
Name[hy]=Devhelp ապահովում
Name[id]=Dukungan Devhelp
@@ -98,6 +99,7 @@
Description[gl]=Fai que a tecla F2 inicie Devhelp para a palabra onde está o cursor
Description[gu]=F2 એ કર્સર આગળના શબ્દ માટે Devhelp લઈ આવે છે
Description[he]=גורם ל־F2 להעלות את Devhelp עבור המילה תחת הסמן
+Description[hi]=कर्सर पर शब्द के लिएDevhelp को लाने में F2 करता है
Description[hu]=Az F2 hatására megjelenik a Devhelp a kurzornál található szóhoz
Description[hy]=Կանչել Devhelp սեղմելով F2 այն բառի վրա, որտեղ կանգնած է կուրսորը
Description[id]=Dengan tombol F2, membuka Devhelp untuk kata pada kursor
diff -Nru devhelp-3.4.0/misc/gedit-plugin/Makefile.in devhelp-3.4.1/misc/gedit-plugin/Makefile.in
--- devhelp-3.4.0/misc/gedit-plugin/Makefile.in 2012-03-27 02:55:15.000000000 +0000
+++ devhelp-3.4.1/misc/gedit-plugin/Makefile.in 2012-04-16 11:55:30.000000000 +0000
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
+# Makefile.in generated by automake 1.11.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -16,6 +16,23 @@
@SET_MAKE@
VPATH = @srcdir@
+am__make_dryrun = \
+ { \
+ am__dry=no; \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
+ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+ *) \
+ for am__flg in $$MAKEFLAGS; do \
+ case $$am__flg in \
+ *=*|--*) ;; \
+ *n*) am__dry=yes; break;; \
+ esac; \
+ done;; \
+ esac; \
+ test $$am__dry = yes; \
+ }
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -61,6 +78,11 @@
am__v_at_0 = @
SOURCES =
DIST_SOURCES =
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -308,8 +330,11 @@
-rm -rf .libs _libs
install-pluginPYTHON: $(plugin_PYTHON)
@$(NORMAL_INSTALL)
- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
@list='$(plugin_PYTHON)'; dlist=; list2=; test -n "$(plugindir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \
+ fi; \
for p in $$list; do \
if test -f "$$p"; then b=; else b="$(srcdir)/"; fi; \
if test -f $$b$$p; then \
@@ -343,8 +368,11 @@
exit $$st
install-pluginDATA: $(plugin_DATA)
@$(NORMAL_INSTALL)
- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
@list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \
+ fi; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
diff -Nru devhelp-3.4.0/misc/Makefile.in devhelp-3.4.1/misc/Makefile.in
--- devhelp-3.4.0/misc/Makefile.in 2012-03-27 02:55:15.000000000 +0000
+++ devhelp-3.4.1/misc/Makefile.in 2012-04-16 11:55:30.000000000 +0000
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
+# Makefile.in generated by automake 1.11.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -15,6 +15,23 @@
@SET_MAKE@
VPATH = @srcdir@
+am__make_dryrun = \
+ { \
+ am__dry=no; \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
+ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+ *) \
+ for am__flg in $$MAKEFLAGS; do \
+ case $$am__flg in \
+ *=*|--*) ;; \
+ *n*) am__dry=yes; break;; \
+ esac; \
+ done;; \
+ esac; \
+ test $$am__dry = yes; \
+ }
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -66,6 +83,11 @@
install-pdf-recursive install-ps-recursive install-recursive \
installcheck-recursive installdirs-recursive pdf-recursive \
ps-recursive uninstall-recursive
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
distclean-recursive maintainer-clean-recursive
AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
@@ -474,13 +496,10 @@
done
@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
- test -d "$(distdir)/$$subdir" \
- || $(MKDIR_P) "$(distdir)/$$subdir" \
- || exit 1; \
- fi; \
- done
- @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
+ $(am__make_dryrun) \
+ || test -d "$(distdir)/$$subdir" \
+ || $(MKDIR_P) "$(distdir)/$$subdir" \
+ || exit 1; \
dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
$(am__relativize); \
new_distdir=$$reldir; \
diff -Nru devhelp-3.4.0/NEWS devhelp-3.4.1/NEWS
--- devhelp-3.4.0/NEWS 2012-03-27 02:54:37.000000000 +0000
+++ devhelp-3.4.1/NEWS 2012-04-16 11:57:10.000000000 +0000
@@ -1,4 +1,14 @@
=============
+Version 3.4.1
+=============
+
+Updated translations: fa, hi
+
+Many thanks to all contributors: Chandan Kumar, chandankumar, Arash Mousavi,
+Chandan Kumar (ciypro)
+
+
+=============
Version 3.4.0
=============
diff -Nru devhelp-3.4.0/po/fa.po devhelp-3.4.1/po/fa.po
--- devhelp-3.4.0/po/fa.po 2011-08-23 01:23:40.000000000 +0000
+++ devhelp-3.4.1/po/fa.po 2012-04-16 11:34:42.000000000 +0000
@@ -7,10 +7,10 @@
msgid ""
msgstr ""
"Project-Id-Version: devhelp master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=devhelp&component=general\n"
-"POT-Creation-Date: 2011-01-29 09:22+0000\n"
-"PO-Revision-Date: 2011-02-13 17:41+0330\n"
-"Last-Translator: Mahyar Moghimi \n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=devhelp&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2011-12-17 15:53+0000\n"
+"PO-Revision-Date: 2012-03-31 14:24+0330\n"
+"Last-Translator: Arash Mousavi \n"
"Language-Team: Persian \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -28,9 +28,9 @@
#. * for transliteration only)
#: ../data/devhelp.desktop.in.in.h:2
#: ../src/dh-main.c:281
-#: ../src/dh-window.c:740
-#: ../src/dh-window.c:1048
-#: ../src/dh-window.c:1880
+#: ../src/dh-window.c:731
+#: ../src/dh-window.c:1039
+#: ../src/dh-window.c:1868
msgid "Devhelp"
msgstr "Devhelp"
@@ -171,26 +171,35 @@
msgstr "قفسهی کتاب"
#: ../data/ui/devhelp.builder.h:2
+msgid "Enabled"
+msgstr "فعال شد"
+
+#: ../data/ui/devhelp.builder.h:3
msgid "Fonts"
msgstr "قلمها"
-#: ../data/ui/devhelp.builder.h:3
+#: ../data/ui/devhelp.builder.h:4
msgid "Preferences"
msgstr "ترجیحها"
-#: ../data/ui/devhelp.builder.h:4
+#: ../data/ui/devhelp.builder.h:5
+#| msgid "_File"
+msgid "Title"
+msgstr "عنوان"
+
+#: ../data/ui/devhelp.builder.h:6
msgid "_Fixed width:"
msgstr "_پهنای ثابت:"
-#: ../data/ui/devhelp.builder.h:5
+#: ../data/ui/devhelp.builder.h:7
msgid "_Group by language"
msgstr "_گروهبندی بر اساس زبان"
-#: ../data/ui/devhelp.builder.h:6
+#: ../data/ui/devhelp.builder.h:8
msgid "_Use system fonts"
msgstr "_استفاده از قلمهای سیستم"
-#: ../data/ui/devhelp.builder.h:7
+#: ../data/ui/devhelp.builder.h:9
msgid "_Variable width: "
msgstr "_پهنای متغیر: "
@@ -202,11 +211,11 @@
msgid "Makes F2 bring up Devhelp for the word at the cursor"
msgstr "کاری میکند تا F2 باعث بالا آمدن DevHelp برای کلمه مشخص شده توسط مکاننما شود"
-#: ../misc/gedit-plugin/devhelp/devhelp.py:38
+#: ../misc/gedit-plugin/devhelp.py:69
msgid "Show API Documentation"
msgstr "نمایش مستندات API"
-#: ../misc/gedit-plugin/devhelp/devhelp.py:40
+#: ../misc/gedit-plugin/devhelp.py:71
msgid "Show API Documentation for the word at the cursor"
msgstr "نمایش مستندات API برای کلمه مشخص شده توسط مکاننما"
@@ -345,174 +354,163 @@
msgid "Search in:"
msgstr "جستجو در:"
-#: ../src/dh-window.c:98
+#: ../src/dh-window.c:99
msgid "50%"
msgstr "۵۰٪"
-#: ../src/dh-window.c:99
+#: ../src/dh-window.c:100
msgid "75%"
msgstr "۷۵٪"
-#: ../src/dh-window.c:100
+#: ../src/dh-window.c:101
msgid "100%"
msgstr "۱۰۰٪"
-#: ../src/dh-window.c:101
+#: ../src/dh-window.c:102
msgid "125%"
msgstr "۱۲۵٪"
-#: ../src/dh-window.c:102
+#: ../src/dh-window.c:103
msgid "150%"
msgstr "۱۵۰٪"
-#: ../src/dh-window.c:103
+#: ../src/dh-window.c:104
msgid "175%"
msgstr "۱۷۵٪"
-#: ../src/dh-window.c:104
+#: ../src/dh-window.c:105
msgid "200%"
msgstr "۲۰۰٪"
-#: ../src/dh-window.c:105
+#: ../src/dh-window.c:106
msgid "300%"
msgstr "۳۰۰٪"
-#: ../src/dh-window.c:106
+#: ../src/dh-window.c:107
msgid "400%"
msgstr "۴۰۰٪"
-#: ../src/dh-window.c:735
+#: ../src/dh-window.c:726
msgid "translator_credits"
msgstr ""
"آرش موسوی \n"
"مهیار مقیمی "
-#: ../src/dh-window.c:742
+#: ../src/dh-window.c:733
msgid "A developers' help browser for GNOME"
msgstr "یک مرورگر راهنما برای توسعهدهندهگان گنوم"
-#: ../src/dh-window.c:749
+#: ../src/dh-window.c:740
msgid "DevHelp Website"
msgstr "پایگاه وب DevHelp"
-#: ../src/dh-window.c:773
+#: ../src/dh-window.c:764
msgid "_File"
msgstr "_پرونده"
-#: ../src/dh-window.c:774
+#: ../src/dh-window.c:765
msgid "_Edit"
msgstr "_ویرایش"
-#: ../src/dh-window.c:775
+#: ../src/dh-window.c:766
msgid "_View"
msgstr "_نما"
-#: ../src/dh-window.c:776
+#: ../src/dh-window.c:767
msgid "_Go"
msgstr "_رفتن"
-#: ../src/dh-window.c:777
+#: ../src/dh-window.c:768
msgid "_Help"
msgstr "_راهنما"
#. File menu
-#: ../src/dh-window.c:780
+#: ../src/dh-window.c:771
msgid "_New Window"
msgstr "_پنجره جدید"
-#: ../src/dh-window.c:782
+#: ../src/dh-window.c:773
msgid "New _Tab"
msgstr "_زبانهی جدید"
-#: ../src/dh-window.c:784
+#: ../src/dh-window.c:775
msgid "_Print…"
msgstr "_چاپ..."
-#: ../src/dh-window.c:796
+#: ../src/dh-window.c:787
#: ../src/eggfindbar.c:342
msgid "Find Next"
msgstr "جستجوی بعدی"
-#: ../src/dh-window.c:798
+#: ../src/dh-window.c:789
#: ../src/eggfindbar.c:329
msgid "Find Previous"
msgstr "جستجوی قبلی"
-#: ../src/dh-window.c:805
+#: ../src/dh-window.c:796
msgid "Go to the previous page"
msgstr "رفتن به صفحهی پیشین"
-#: ../src/dh-window.c:808
+#: ../src/dh-window.c:799
msgid "Go to the next page"
msgstr "رفتن به صفحهی بعدی"
-#: ../src/dh-window.c:811
+#: ../src/dh-window.c:802
msgid "_Contents Tab"
msgstr "_زبانهی محتویات"
-#: ../src/dh-window.c:814
+#: ../src/dh-window.c:805
msgid "_Search Tab"
msgstr "_زبانهی جستجو"
#. View menu
-#: ../src/dh-window.c:818
+#: ../src/dh-window.c:809
msgid "_Larger Text"
msgstr "_متن بزرگتر"
-#: ../src/dh-window.c:819
+#: ../src/dh-window.c:810
msgid "Increase the text size"
msgstr "افزایش اندازهی متن"
-#: ../src/dh-window.c:821
+#: ../src/dh-window.c:812
msgid "S_maller Text"
msgstr "م_تن کوچکتر"
-#: ../src/dh-window.c:822
+#: ../src/dh-window.c:813
msgid "Decrease the text size"
msgstr "کاهش اندازهی متن"
-#: ../src/dh-window.c:824
+#: ../src/dh-window.c:815
msgid "_Normal Size"
msgstr "اندازهی _عادی"
-#: ../src/dh-window.c:825
+#: ../src/dh-window.c:816
msgid "Use the normal text size"
msgstr "استفاده از اندازهی عادی متن"
-#: ../src/dh-window.c:834
+#: ../src/dh-window.c:825
msgid "Leave fullscreen mode"
msgstr "خروج از حالت تمامصفحه"
-#: ../src/dh-window.c:841
+#: ../src/dh-window.c:832
msgid "Display in full screen"
msgstr "نمایش در حالت تمامصفحه"
#. Translators: This refers to text size
-#: ../src/dh-window.c:961
+#: ../src/dh-window.c:952
msgid "Larger"
msgstr "بزرگتر"
#. Translators: This refers to text size
-#: ../src/dh-window.c:964
+#: ../src/dh-window.c:955
msgid "Smaller"
msgstr "کوچکتر"
-#. i18n: please don't translate
-#. * "Devhelp", it's a name, not a
-#. * generic word.
-#: ../src/dh-window.c:1109
-msgid "About Devhelp"
-msgstr "دربارهی DevHelp"
-
-#: ../src/dh-window.c:1114
-msgid "Preferences…"
-msgstr "ترجیحها..."
-
-#: ../src/dh-window.c:1156
+#: ../src/dh-window.c:1159
msgid "Contents"
msgstr "محتویات"
-#: ../src/dh-window.c:1166
+#: ../src/dh-window.c:1169
msgid "Search"
msgstr "جستجو"
@@ -520,8 +518,8 @@
msgid "Error opening the requested link."
msgstr "خطا در هنگام بازکردن لینک درخواست شده."
-#: ../src/dh-window.c:1666
-#: ../src/dh-window.c:1908
+#: ../src/dh-window.c:1657
+#: ../src/dh-window.c:1896
msgid "Empty Page"
msgstr "صفحهی خالی"
@@ -548,3 +546,8 @@
msgid "Toggle case sensitive search"
msgstr "تغییر حالت به جستجو به شکل حساس به بزرگی و کوچکی حروف"
+#~ msgid "About Devhelp"
+#~ msgstr "دربارهی DevHelp"
+
+#~ msgid "Preferences…"
+#~ msgstr "ترجیحها..."
diff -Nru devhelp-3.4.0/po/hi.po devhelp-3.4.1/po/hi.po
--- devhelp-3.4.0/po/hi.po 2011-08-23 01:23:40.000000000 +0000
+++ devhelp-3.4.1/po/hi.po 2012-04-16 11:34:42.000000000 +0000
@@ -1,236 +1,587 @@
-# SOME DESCRIPTIVE TITLE.
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the PACKAGE package.
-# G Karunakar , 2003.
#
+# G Karunakar , 2003.
+# chandankumar , 2012.
msgid ""
msgstr ""
"Project-Id-Version: devhelp HEAD\n"
-"POT-Creation-Date: 2004-03-16 23:25+0100\n"
-"PO-Revision-Date: 2003-04-09 14:30+0530\n"
-"Last-Translator: G Karunakar \n"
-"Language-Team: Gnome Hindi Team \n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=devhel"
+"p&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2012-04-05 16:37+0000\n"
+"PO-Revision-Date: 2012-04-11 12:41+0530\n"
+"Last-Translator: chandankumar (ciypro) \n"
+"Language-Team: Hindi \n"
+"Language: hi\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Report-Msgid-Bugs-To: \n"
-
-#: devhelp.desktop.in.h:1
-#, fuzzy
-msgid "Developer's Help program"
-msgstr "डेवलपर सहायता प्रोग्राम"
-
-#: devhelp.desktop.in.h:2 ui/devhelp.glade.h:4
-#, fuzzy
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Lokalize 1.2\n"
+"X-DamnedLies-Scope: partial\n"
+
+#. i18n: Please don't translate "Devhelp" (it's marked as translatable
+#. * for transliteration only)
+#: ../data/devhelp.desktop.in.in.h:1 ../src/dh-main.c:281
+#: ../src/dh-window.c:745 ../src/dh-window.c:1051 ../src/dh-window.c:1967
msgid "Devhelp"
-msgstr "डेवहेल्प"
-
-#: devhelp.keys.in.h:1
-#, fuzzy
-msgid "Devhelp Book"
-msgstr "डेवहेल्प"
+msgstr "Devhelp"
-#: devhelp.schemas.in.h:1
-msgid "Font for fixed text"
-msgstr ""
+#: ../data/devhelp.desktop.in.in.h:2
+msgid "Developer's Help program"
+msgstr "डेवलपर मदद प्रोग्राम"
-#: devhelp.schemas.in.h:2
-msgid "Font for text"
-msgstr ""
+#: ../data/devhelp.desktop.in.in.h:3
+msgid "Documentation Browser"
+msgstr "प्रलेखन ब्राउज़र"
-#: devhelp.schemas.in.h:3
-msgid "Font for text with fixed width."
-msgstr ""
+#: ../data/devhelp.schemas.in.h:3
+msgid "Width of the main window"
+msgstr "मुख्य विंडो की चौड़ाई"
-#: devhelp.schemas.in.h:4
-msgid "Font for text with variable width."
-msgstr ""
+#: ../data/devhelp.schemas.in.h:4
+msgid "The width of the main window."
+msgstr "मुख्य विंडो की चौड़ाई."
-#: devhelp.schemas.in.h:5
+#: ../data/devhelp.schemas.in.h:5
msgid "Height of main window"
-msgstr ""
+msgstr "मुख्य विंडो की ऊँचाई"
-#: devhelp.schemas.in.h:6
-msgid "Location of the paned"
-msgstr ""
+#: ../data/devhelp.schemas.in.h:6
+msgid "The height of the main window."
+msgstr "मुख्य विंडो की ऊँचाई."
-#: devhelp.schemas.in.h:7
-msgid "The X position of the main window."
-msgstr ""
+#: ../data/devhelp.schemas.in.h:7
+msgid "X position of main window"
+msgstr "मुख्य विंडो के X स्थिति"
-#: devhelp.schemas.in.h:8
-msgid "The Y position of the main window."
-msgstr ""
+#: ../data/devhelp.schemas.in.h:8
+msgid "The X position of the main window."
+msgstr "मुख्य विंडो की X स्थिति."
-#: devhelp.schemas.in.h:9
-msgid "The height of the main window."
-msgstr ""
+#: ../data/devhelp.schemas.in.h:9
+msgid "Y position of main window"
+msgstr "मुख्य विंडो के Y स्थिति"
-#: devhelp.schemas.in.h:10
-msgid "The location of the paned separator."
-msgstr ""
+#: ../data/devhelp.schemas.in.h:10
+msgid "The Y position of the main window."
+msgstr "मुख्य विंडो की Y स्थिति."
-#: devhelp.schemas.in.h:11
-msgid "The width of the main window."
-msgstr ""
+#: ../data/devhelp.schemas.in.h:11
+#| msgid "Width of the main window"
+msgid "Width of the assistant window"
+msgstr "सहायक विंडो की चौड़ाई"
+
+#: ../data/devhelp.schemas.in.h:12
+#| msgid "The width of the main window."
+msgid "The width of the assistant window."
+msgstr "सहायक विंडो की चौड़ाई."
+
+#: ../data/devhelp.schemas.in.h:13
+#| msgid "Height of main window"
+msgid "Height of assistant window"
+msgstr "सहायक विंडो की ऊंचाई"
+
+#: ../data/devhelp.schemas.in.h:14
+#| msgid "The height of the main window."
+msgid "The height of the assistant window."
+msgstr "सहायक विंडो की ऊँचाई."
+
+#: ../data/devhelp.schemas.in.h:15
+#| msgid "X position of main window"
+msgid "X position of assistant window"
+msgstr "सहायक विंडो के X स्थिति"
+
+#: ../data/devhelp.schemas.in.h:16
+#| msgid "The X position of the main window."
+msgid "The X position of the assistant window."
+msgstr "सहायक विंडो की X स्थिति."
+
+#: ../data/devhelp.schemas.in.h:17
+#| msgid "Y position of main window"
+msgid "Y position of assistant window"
+msgstr "सहायक विंडो के Y स्थिति"
+
+#: ../data/devhelp.schemas.in.h:18
+#| msgid "The Y position of the main window."
+msgid "The Y position of the assistant window."
+msgstr "सहायक विंडो की Y स्थिति."
+
+#: ../data/devhelp.schemas.in.h:19
+#| msgid "Width of the main window"
+msgid "Width of the index and search pane"
+msgstr "सूचकांक और खोज फलक की चौड़ाई"
+
+#: ../data/devhelp.schemas.in.h:20
+#| msgid "The width of the main window."
+msgid "The width of the index and search pane."
+msgstr "सूचकांक और खोज फलक की चौड़ाई."
-#: devhelp.schemas.in.h:12
+#: ../data/devhelp.schemas.in.h:27
msgid "Use system fonts"
-msgstr ""
+msgstr "प्रणाली फोंट का प्रयोग करें"
-#: devhelp.schemas.in.h:13
+#: ../data/devhelp.schemas.in.h:28
msgid "Use the system default fonts."
-msgstr ""
+msgstr "सिस्टम डिफ़ॉल्ट फ़ॉन्ट का प्रयोग करें."
-#: devhelp.schemas.in.h:14
-msgid "Width of the main window"
-msgstr ""
+#: ../data/devhelp.schemas.in.h:29
+msgid "Font for text"
+msgstr "पाठ के लिए फ़ॉन्ट"
-#: devhelp.schemas.in.h:15
-msgid "X position of main window"
-msgstr ""
+#: ../data/devhelp.schemas.in.h:30
+msgid "Font for text with variable width."
+msgstr "परिवर्तनीय चौड़ाई के साथ पाठ के लिए फ़ॉन्ट."
-#: devhelp.schemas.in.h:16
-msgid "Y position of main window"
-msgstr ""
+#: ../data/devhelp.schemas.in.h:31
+#| msgid "Font for fixed text"
+msgid "Font for fixed width text"
+msgstr "स्थिर चौड़ाई पाठ के लिए फ़ॉन्ट"
+
+#: ../data/devhelp.schemas.in.h:32
+#| msgid "Font for text with fixed width."
+msgid "Font for text with fixed width, such as code examples."
+msgstr "कोड उदाहरण के रूप में, फिक्स्ड चौड़ाई के साथ पाठ के लिए फ़ॉन्ट."
-#: src/dh-main.c:259
-msgid "Specify the size and location of the window"
-msgstr ""
+#: ../data/ui/devhelp.builder.h:1
+msgid "Preferences"
+msgstr "प्राथमिकताएँ"
-#: src/dh-main.c:260
-msgid "WIDTHxHEIGHT+XOFF+YOFF"
-msgstr ""
+#: ../data/ui/devhelp.builder.h:2
+msgid "_Group by language"
+msgstr "भाषा द्वारा समूह (_G)"
+
+#: ../data/ui/devhelp.builder.h:3
+msgid "Enabled"
+msgstr "सक्षम"
+
+#: ../data/ui/devhelp.builder.h:4
+#| msgid "_File"
+msgid "Title"
+msgstr "शीर्षक"
+
+#: ../data/ui/devhelp.builder.h:5
+msgid "Book Shelf"
+msgstr "किताब शेल्फ"
-#: src/dh-main.c:268
-msgid "Search for a function"
-msgstr "प्रकार्य ढूँढें"
+#: ../data/ui/devhelp.builder.h:6
+msgid "_Use system fonts"
+msgstr "सिस्टम फ़ॉन्ट प्रयोग करें (_U)"
+
+#: ../data/ui/devhelp.builder.h:7
+#| msgid "Variable width: "
+msgid "_Variable width: "
+msgstr "चर चौड़ाई: (_V)"
+
+#: ../data/ui/devhelp.builder.h:8
+#| msgid "Fixed width:"
+msgid "_Fixed width:"
+msgstr "स्थिर चौड़ाई: (_F)"
+
+#: ../data/ui/devhelp.builder.h:9
+#| msgid "Contents"
+msgid "Fonts"
+msgstr "फ़ॉन्ट्स"
+
+#: ../misc/gedit-plugin/devhelp.desktop.in.h:1
+#| msgid "Devhelp Book"
+msgid "Devhelp support"
+msgstr "Devhelp समर्थन"
+
+#: ../misc/gedit-plugin/devhelp.desktop.in.h:2
+msgid "Makes F2 bring up Devhelp for the word at the cursor"
+msgstr "कर्सर पर शब्द के लिएDevhelp को लाने में F2 करता है"
+
+#: ../misc/gedit-plugin/devhelp.py:69
+msgid "Show API Documentation"
+msgstr "एपीआई प्रलेखन दिखाएँ"
+
+#: ../misc/gedit-plugin/devhelp.py:71
+msgid "Show API Documentation for the word at the cursor"
+msgstr "शब्द के लिए कर्सर पर एपीआई प्रलेखन दिखाएँ"
+
+#. i18n: Please don't translate "Devhelp".
+#: ../src/dh-assistant.c:76
+msgid "Devhelp — Assistant"
+msgstr "Devhelp — सहायक"
+
+#: ../src/dh-assistant-view.c:407
+msgid "Book:"
+msgstr "किताब:"
+
+#: ../src/dh-book.c:252
+#, c-format
+msgid "Language: %s"
+msgstr "भाषा: %s"
+
+#: ../src/dh-book.c:253
+msgid "Language: Undefined"
+msgstr "भाषा: अपरिभाषित"
+
+#. i18n: a documentation book
+#: ../src/dh-link.c:267
+msgid "Book"
+msgstr "किताब"
+
+#. i18n: a "page" in a documentation book
+#: ../src/dh-link.c:270
+msgid "Page"
+msgstr "पृष्ठ"
+
+#. i18n: a search hit in the documentation, could be a
+#. * function, macro, struct, etc
+#: ../src/dh-link.c:274
+msgid "Keyword"
+msgstr "कीवर्ड"
+
+#. i18n: in the programming language context, if you don't
+#. * have an ESTABLISHED term for it, leave it
+#. * untranslated.
+#: ../src/dh-link.c:279
+#| msgid "Section"
+msgid "Function"
+msgstr "फंक्शन"
+
+#. i18n: in the programming language context, if you don't
+#. * have an ESTABLISHED term for it, leave it
+#. * untranslated.
+#: ../src/dh-link.c:284
+msgid "Struct"
+msgstr "Struct"
+
+#. i18n: in the programming language context, if you don't
+#. * have an ESTABLISHED term for it, leave it
+#. * untranslated.
+#: ../src/dh-link.c:289
+msgid "Macro"
+msgstr "मैक्रो"
+
+#. i18n: in the programming language context, if you don't
+#. * have an ESTABLISHED term for it, leave it
+#. * untranslated.
+#: ../src/dh-link.c:294
+msgid "Enum"
+msgstr "Enum"
+
+#. i18n: in the programming language context, if you don't
+#. * have an ESTABLISHED term for it, leave it
+#. * untranslated.
+#: ../src/dh-link.c:299
+msgid "Type"
+msgstr "क़िस्म"
+
+#: ../src/dh-main.c:47
+#| msgid "Search for a function"
+msgid "Search for a keyword"
+msgstr "कीवर्ड के लिए खोज"
-#: src/dh-main.c:277
+#: ../src/dh-main.c:52
msgid "Quit any running Devhelp"
msgstr "कोइ चालू डेवहेल्प बंद करें"
-#: src/dh-parser.c:104 src/dh-parser.c:181 src/dh-parser.c:228
+#: ../src/dh-main.c:57
+msgid "Display the version and exit"
+msgstr "संस्करण और निकास प्रदर्शित"
+
+#: ../src/dh-main.c:62
+msgid "Focus the Devhelp window with the search field active"
+msgstr "खोज क्षेत्र सक्रिय के साथ Devhelp विंडो ध्यान केंद्रित करें"
+
+#: ../src/dh-main.c:67
+msgid "Search and display any hit in the assistant window"
+msgstr "खोज और सहायक विंडो में कोई भी हिट प्रदर्शित"
+
+#: ../src/dh-parser.c:97 ../src/dh-parser.c:199 ../src/dh-parser.c:263
+#: ../src/dh-parser.c:273
#, c-format
-msgid "Expected '%s' got '%s' at line %d, column %d"
-msgstr ""
+#| msgid "Expected '%s' got '%s' at line %d, column %d"
+msgid "Expected '%s', got '%s' at line %d, column %d"
+msgstr "उम्मीद '%s', मिला '%s' पंक्ति %d, कॉलम %d पर"
-#: src/dh-parser.c:120
+#: ../src/dh-parser.c:114
#, c-format
msgid "Invalid namespace '%s' at line %d, column %d"
-msgstr ""
+msgstr "अवैध नामस्थान '%s' पंक्ति %d, कॉलम %d पर"
-#: src/dh-parser.c:149
+#: ../src/dh-parser.c:143
#, c-format
-msgid "title, name, and link elements are required at line %d, column %d"
+#| msgid "title, name, and link elements are required at line %d, column %d"
+msgid ""
+"\"title\", \"name\" and \"link\" elements are required at line %d, column %d"
msgstr ""
+"\"शीर्षक\", \"नाम\", और \"लिंक\" तत्वों %d पंक्ति, कॉलम %d पर आवश्यक हैं"
-#: src/dh-parser.c:202
+#: ../src/dh-parser.c:218
#, c-format
-msgid "name and link elements are required inside on line %d, column %d"
+#| msgid ""
+#| "name and link elements are required inside on line %d, column %d"
+msgid ""
+"\"name\" and \"link\" elements are required inside on line %d, column %"
+"d"
msgstr ""
+"\"नाम\" और \"लिंक\" तत्वों %d पंक्ति, कॉलम %d पर के अंदर आवश्यक हैं"
-#: src/dh-parser.c:250
+#: ../src/dh-parser.c:298
#, c-format
+#| msgid ""
+#| "name and link elements are required inside on line %d, column %d"
msgid ""
-"name and link elements are required inside on line %d, column %d"
-msgstr ""
-
-#: src/dh-parser.c:337 src/dh-parser.c:423
-msgid "Could not create book parser"
+"\"name\" and \"link\" elements are required inside '%s' on line %d, column %d"
msgstr ""
+"\"नाम\" और \"लिंक\" तत्वों '%s' के अंदर %d पंक्ति, कॉलम %d पर आवश्यक हैं"
-#: src/dh-parser.c:347 src/dh-parser.c:433
-msgid "Could not create markup parser"
-msgstr ""
+#: ../src/dh-parser.c:311
+#, c-format
+#| msgid ""
+#| "name and link elements are required inside on line %d, column %d"
+msgid "\"type\" element is required inside on line %d, column %d"
+msgstr "\"प्रकार\" तत्व %d पंक्ति, कॉलम %d पर के अंदर आवश्यक हैं"
-#: src/dh-parser.c:479
+#: ../src/dh-parser.c:514
#, c-format
msgid "Cannot uncompress book '%s': %s"
-msgstr ""
-
-#: src/dh-search.c:417
-#, fuzzy
-msgid "_Search:"
-msgstr "खोज"
+msgstr "पुस्तक '%s' नहीं uncompress कर सकते हैं: %s"
-#: src/dh-search.c:461
-msgid "Section"
-msgstr "भाग"
+#: ../src/dh-search.c:493
+msgid "All books"
+msgstr "सभी पुस्तकों"
+
+#: ../src/dh-search.c:1111
+#| msgid "_Search:"
+msgid "Search in:"
+msgstr "में खोजें:"
+
+#: ../src/dh-window.c:104
+msgid "50%"
+msgstr "50%"
+
+#: ../src/dh-window.c:105
+msgid "75%"
+msgstr "75%"
+
+#: ../src/dh-window.c:106
+msgid "100%"
+msgstr "100%"
+
+#: ../src/dh-window.c:107
+msgid "125%"
+msgstr "125%"
+
+#: ../src/dh-window.c:108
+msgid "150%"
+msgstr "150%"
+
+#: ../src/dh-window.c:109
+msgid "175%"
+msgstr "175%"
+
+#: ../src/dh-window.c:110
+msgid "200%"
+msgstr "200%"
+
+#: ../src/dh-window.c:111
+msgid "300%"
+msgstr "300%"
+
+#: ../src/dh-window.c:112
+msgid "400%"
+msgstr "400%"
+
+#: ../src/dh-window.c:740
+msgid "translator_credits"
+msgstr "चंदन कुमार (chandankumar.093047@gmail.com)"
+
+#: ../src/dh-window.c:747
+#| msgid "A developer's help browser for GNOME 2"
+msgid "A developers' help browser for GNOME"
+msgstr "एक 'डेवलपर्स मदद ब्राउज़र GNOME के लिए"
+
+#: ../src/dh-window.c:754
+msgid "DevHelp Website"
+msgstr "DevHelp वेबसाइट"
-#: src/dh-window.c:111
+#: ../src/dh-window.c:778
msgid "_File"
msgstr "फाइल (_F)"
-#: src/dh-window.c:112
+#: ../src/dh-window.c:779
msgid "_Edit"
-msgstr ""
+msgstr "संपादन (_E)"
+
+#: ../src/dh-window.c:780
+#| msgid "_File"
+msgid "_View"
+msgstr "दृश्य_(V)"
-#: src/dh-window.c:113 ui/devhelp.glade.h:10
+#: ../src/dh-window.c:781
msgid "_Go"
msgstr "जाना (_G)"
-#: src/dh-window.c:114
+#: ../src/dh-window.c:782
msgid "_Help"
msgstr "सहायता (_H)"
-#: src/dh-window.c:292
-#, c-format
-msgid "Cannot set UI: %s"
-msgstr ""
+#. File menu
+#: ../src/dh-window.c:785
+msgid "_New Window"
+msgstr "नया विंडो (_N)"
+
+#: ../src/dh-window.c:787
+msgid "New _Tab"
+msgstr "नया टैब (_T)"
+
+#: ../src/dh-window.c:789
+msgid "_Print…"
+msgstr "छापें (_P)…"
+
+#: ../src/dh-window.c:801 ../src/eggfindbar.c:342
+msgid "Find Next"
+msgstr "अगला ढूंढें"
+
+#: ../src/dh-window.c:803 ../src/eggfindbar.c:329
+msgid "Find Previous"
+msgstr "पिछला ढूंढें"
+
+#: ../src/dh-window.c:810
+msgid "Go to the previous page"
+msgstr "पिछले पृष्ठ पर जाएँ"
+
+#: ../src/dh-window.c:813
+msgid "Go to the next page"
+msgstr "अगले पेज पर जाएँ"
+
+#: ../src/dh-window.c:816
+#| msgid "Contents"
+msgid "_Contents Tab"
+msgstr "सामग्री टैब (_C)"
+
+#: ../src/dh-window.c:819
+#| msgid "_Search:"
+msgid "_Search Tab"
+msgstr "खोज टैब (_S)"
+
+#. View menu
+#: ../src/dh-window.c:823
+msgid "_Larger Text"
+msgstr "बड़ा पाठ (_L)"
+
+#: ../src/dh-window.c:824
+msgid "Increase the text size"
+msgstr "पाठ का आकार बढ़ाएँ"
+
+#: ../src/dh-window.c:826
+msgid "S_maller Text"
+msgstr "छोटा पाठ (_m)"
+
+#: ../src/dh-window.c:827
+msgid "Decrease the text size"
+msgstr "पाठ का आकार घटाएँ"
+
+#: ../src/dh-window.c:829
+msgid "_Normal Size"
+msgstr "सामान्य आकार (_N)"
+
+#: ../src/dh-window.c:830
+msgid "Use the normal text size"
+msgstr "सामान्य पाठ आकार उपयोग"
+
+#: ../src/dh-window.c:839
+msgid "Leave fullscreen mode"
+msgstr "पूर्ण स्क्रीन छोड़ें"
+
+#: ../src/dh-window.c:846
+msgid "Display in full screen"
+msgstr "पूर्ण स्क्रीन में प्रदर्शित करें"
+
+#. Translators: This refers to text size
+#: ../src/dh-window.c:966
+msgid "Larger"
+msgstr "बड़ा"
+
+#. Translators: This refers to text size
+#: ../src/dh-window.c:969
+msgid "Smaller"
+msgstr "छोटा"
-#: src/dh-window.c:352 ui/devhelp.glade.h:3
+#: ../src/dh-window.c:1171
msgid "Contents"
msgstr "घटक"
-#: src/dh-window.c:363
+#: ../src/dh-window.c:1181
msgid "Search"
msgstr "खोज"
-#: src/dh-window.c:446
-msgid "A developer's help browser for GNOME 2"
-msgstr "गनोम विकासकर्ता के लिए सहायता"
+#: ../src/dh-window.c:1395
+msgid "Error opening the requested link."
+msgstr "अनुरोध लिंक खोलने में त्रुटि."
-#: src/dh-window.c:462
-msgid "Devhelp project page"
-msgstr ""
+#: ../src/dh-window.c:1748 ../src/dh-window.c:1995
+msgid "Empty Page"
+msgstr "रिक्त पेज"
-#: src/dh-window.c:466
-msgid "Bug report Devhelp"
-msgstr ""
+#: ../src/eggfindbar.c:320
+msgid "Find:"
+msgstr "ढूंढें:"
-#: ui/devhelp.glade.h:1
-msgid " "
-msgstr ""
+#: ../src/eggfindbar.c:333 ../src/eggfindbar.c:336
+msgid "Find previous occurrence of the search string"
+msgstr "खोज स्ट्रिंग की पिछली उपस्थिति ढूंढें"
-#: ui/devhelp.glade.h:2
-msgid "Fonts"
-msgstr ""
+#: ../src/eggfindbar.c:346 ../src/eggfindbar.c:349
+msgid "Find next occurrence of the search string"
+msgstr "खोज स्ट्रिंग की अगली उपस्थिति ढूंढें"
-#: ui/devhelp.glade.h:5
-msgid "Fixed width:"
-msgstr ""
+#: ../src/eggfindbar.c:358
+msgid "C_ase Sensitive"
+msgstr "स्थिति के प्रति संवेदनशील (_a)"
-#: ui/devhelp.glade.h:6
-msgid "Preferences"
-msgstr ""
+#: ../src/eggfindbar.c:362 ../src/eggfindbar.c:365
+msgid "Toggle case sensitive search"
+msgstr "स्थिति संवेदनशील खोज टॉगल करें"
-#: ui/devhelp.glade.h:7
-msgid "Variable width: "
-msgstr ""
+#~ msgid "Location of the paned"
+#~ msgstr "paned का स्थान"
-#: ui/devhelp.glade.h:8
-msgid "_Back"
-msgstr ""
+#~ msgid "The location of the paned separator."
+#~ msgstr "paned विभाजक का स्थान."
-#: ui/devhelp.glade.h:9
-msgid "_Forward"
-msgstr ""
+#~ msgid "Specify the size and location of the window"
+#~ msgstr "विंडो का आकार और स्थान निर्दिष्ट करें"
-#: ui/devhelp.glade.h:11
-msgid "_Use system fonts"
-msgstr ""
+#~ msgid "WIDTHxHEIGHT+XOFF+YOFF"
+#~ msgstr "WIDTHxHEIGHT+XOFF+YOFF"
+
+#~ msgid ""
+#~ "name and link elements are required inside on line %d, column %"
+#~ "d"
+#~ msgstr "नाम और लिंक तत्वों %d पंक्ति, कॉलम %d पर के अंदर आवश्यक हैं"
+
+#~ msgid "Could not create book parser"
+#~ msgstr "पुस्तक पार्सर नहीं बना सका"
+
+#~ msgid "Could not create markup parser"
+#~ msgstr "मार्कअप पार्सर नहीं बना सका"
+
+#~ msgid "Cannot set UI: %s"
+#~ msgstr "यूआई सेट नहीं कर सकते: %s"
+
+#~ msgid "Devhelp project page"
+#~ msgstr "Devhelp परियोजना पृष्ठ"
+
+#~ msgid "Bug report Devhelp"
+#~ msgstr "बग रिपोर्ट Devhelp"
+
+#~ msgid " "
+#~ msgstr " "
+
+#~ msgid "Fonts"
+#~ msgstr "फ़ॉन्ट्स"
+
+#~ msgid "_Back"
+#~ msgstr "पीछे (_B)"
+
+#~ msgid "_Forward"
+#~ msgstr "आगे (_F)"
#~ msgid "_Search for:"
#~ msgstr "के लिए ढूँढें (_S):"
diff -Nru devhelp-3.4.0/src/dh-marshal.c devhelp-3.4.1/src/dh-marshal.c
--- devhelp-3.4.0/src/dh-marshal.c 2012-03-27 02:55:27.000000000 +0000
+++ devhelp-3.4.1/src/dh-marshal.c 2011-08-21 10:00:24.000000000 +0000
@@ -5,7 +5,7 @@
#ifdef G_ENABLE_DEBUG
#define g_marshal_value_peek_boolean(v) g_value_get_boolean (v)
-#define g_marshal_value_peek_char(v) g_value_get_schar (v)
+#define g_marshal_value_peek_char(v) g_value_get_char (v)
#define g_marshal_value_peek_uchar(v) g_value_get_uchar (v)
#define g_marshal_value_peek_int(v) g_value_get_int (v)
#define g_marshal_value_peek_uint(v) g_value_get_uint (v)
diff -Nru devhelp-3.4.0/src/Makefile.in devhelp-3.4.1/src/Makefile.in
--- devhelp-3.4.0/src/Makefile.in 2012-03-27 02:55:15.000000000 +0000
+++ devhelp-3.4.1/src/Makefile.in 2012-04-16 11:55:31.000000000 +0000
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
+# Makefile.in generated by automake 1.11.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -18,6 +18,23 @@
VPATH = @srcdir@
+am__make_dryrun = \
+ { \
+ am__dry=no; \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
+ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+ *) \
+ for am__flg in $$MAKEFLAGS; do \
+ case $$am__flg in \
+ *=*|--*) ;; \
+ *n*) am__dry=yes; break;; \
+ esac; \
+ done;; \
+ esac; \
+ test $$am__dry = yes; \
+ }
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -157,6 +174,11 @@
am__v_GEN_0 = @echo " GEN " $@;
SOURCES = $(libdevhelp_3_la_SOURCES) $(devhelp_SOURCES)
DIST_SOURCES = $(am__libdevhelp_3_la_SOURCES_DIST) $(devhelp_SOURCES)
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
HEADERS = $(devhelpinclude_HEADERS)
ETAGS = etags
CTAGS = ctags
@@ -458,7 +480,6 @@
$(am__aclocal_m4_deps):
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
- test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
list2=; for p in $$list; do \
if test -f $$p; then \
@@ -466,6 +487,8 @@
else :; fi; \
done; \
test -z "$$list2" || { \
+ echo " $(MKDIR_P) '$(DESTDIR)$(libdir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(libdir)" || exit 1; \
echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \
$(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \
}
@@ -491,8 +514,11 @@
$(AM_V_CCLD)$(libdevhelp_3_la_LINK) -rpath $(libdir) $(libdevhelp_3_la_OBJECTS) $(libdevhelp_3_la_LIBADD) $(LIBS)
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
- test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
+ fi; \
for p in $$list; do echo "$$p $$p"; done | \
sed 's/$(EXEEXT)$$//' | \
while read p p1; do if test -f $$p || test -f $$p1; \
@@ -754,8 +780,11 @@
-rm -rf .libs _libs
install-devhelpincludeHEADERS: $(devhelpinclude_HEADERS)
@$(NORMAL_INSTALL)
- test -z "$(devhelpincludedir)" || $(MKDIR_P) "$(DESTDIR)$(devhelpincludedir)"
@list='$(devhelpinclude_HEADERS)'; test -n "$(devhelpincludedir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(devhelpincludedir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(devhelpincludedir)" || exit 1; \
+ fi; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \