Dear developers, compiling the current 1.3 and 1.3.1 releases I got some trouble on my Linux computer. As I found this was based on the incomplete viking package. The directory "doc/reference" is missing even it is used in configure.ac line 355. Automake hangs here if called with autoreconf.
Also the configure option --enable-gtk-doc does not work due to this
missing directory.
Pleas find attached a patch solving this issue by using AM_CONDITIONAL()
to enable the "gtk-doc"-compile feature properly and adding the
mentioned directory to the distributed files (by "make dist").
This patch fixes also two other issues:
1) A doubled defined "XP" in src/Makefile.am (conplained by automake)
2) A cleaned gnome-doc-utils.make in target "dist-clean"; according to
common autotools rules this should be cleaned in maintainer mode only.
This is a nasty bug if you build debian packages.
Hopefully you will find this patch usefull.
Guido
--
http://www.bayernline.de/~gscholz/
http://www.lug-burghausen.org/
diff -Nur viking-1.3/configure.ac viking-1.3_gs/configure.ac
--- viking-1.3/configure.ac 2012-08-04 13:38:54.000000000 +0200
+++ viking-1.3_gs/configure.ac 2012-08-04 16:38:00.000000000 +0200
@@ -341,6 +341,9 @@
ACLOCAL_AMFLAGS="\${ACLOCAL_FLAGS}"
AC_SUBST(ACLOCAL_AMFLAGS)
+AM_CONDITIONAL(VIKING_DOC, test x${enable_gtk_doc} = xyes)
+
+
# Configuration
AC_CONFIG_FILES([Makefile
src/Makefile
@@ -350,10 +353,8 @@
help/Makefile
data/Makefile
doc/Makefile
+ doc/reference/Makefile
doc/examples/Makefile])
-if test x$enable_gtk_doc = xyes; then
-AC_CONFIG_FILES([doc/reference/Makefile])
-fi
AC_OUTPUT([
viking.spec
])
diff -Nur viking-1.3/doc/Makefile.am viking-1.3_gs/doc/Makefile.am
--- viking-1.3/doc/Makefile.am 2012-08-04 13:38:54.000000000 +0200
+++ viking-1.3_gs/doc/Makefile.am 2012-08-04 15:47:25.000000000 +0200
@@ -1,4 +1,4 @@
-SUBDIRS = examples
+SUBDIRS = examples reference
EXTRA_DIST = GETTING-STARTED GPSMAPPER \
viking.xml
diff -Nur viking-1.3/Makefile.am viking-1.3_gs/Makefile.am
--- viking-1.3/Makefile.am 2012-08-04 13:38:54.000000000 +0200
+++ viking-1.3_gs/Makefile.am 2012-08-04 16:36:53.000000000 +0200
@@ -10,10 +10,10 @@
make
EXTRA_DIST = \
- gnome-doc-utils.make \
- ChangeLog.0 \
- viking.spec \
- $(INTLTOOL)
+ gnome-doc-utils.make \
+ ChangeLog.0 \
+ viking.spec \
+ $(INTLTOOL)
.PHONY: generate-changelog
generate-changelog:
@@ -25,8 +25,10 @@
dist-hook: viking.spec generate-changelog
cp $(top_builddir)/viking.spec $(distdir)
+MAINTAINERCLEANFILES = \
+ gnome-doc-utils.make
+
DISTCLEANFILES = \
- gnome-doc-utils.make \
intltool-extract \
intltool-merge \
intltool-update
diff -Nur viking-1.3/src/Makefile.am viking-1.3_gs/src/Makefile.am
--- viking-1.3/src/Makefile.am 2012-08-04 13:38:54.000000000 +0200
+++ viking-1.3_gs/src/Makefile.am 2012-08-04 15:39:00.000000000 +0200
@@ -15,7 +15,6 @@
echo "NULL};" >> $@
if HAVE_XSLTPROC
-XP=@XP@
documenters.h: $(top_srcdir)/help/C/viking.xml
$(XP) $(srcdir)/docbook2documenters.xsl $(top_srcdir)/help/C/viking.xml > $@
else
signature.asc
Description: Digital signature
------------------------------------------------------------------------------ Live Security Virtual Conference Exclusive live event will cover all the ways today's security and threat landscape has changed and how IT managers can respond. Discussions will include endpoint security, mobile security and the latest in malware threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________ Viking-devel mailing list Viking-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/viking-devel Viking home page: http://viking.sf.net/
