From 58d97da46ee86dd94fe5533ac4e6509b9c2545bc Mon Sep 17 00:00:00 2001
Message-Id: <58d97da46ee86dd94fe5533ac4e6509b9c2545bc.1714045647.git.mdw@distorted.org.uk>
From: Mark Wooding <mdw@chiark.greenend.org.uk>
Date: Fri, 21 Mar 2008 19:58:16 +0000
Subject: [PATCH] A couple of fixes for Ubuntu Dapper:   - include
 sensible-browser in list of browsers to check for   - don't use doc_... in
 *.am, since Dapper's Automake hates it
Organization: Straylight/Edgeware

From: Richard Kettlewell <richard@dekabrach>

---
 configure.ac             | 2 +-
 disobedience/Makefile.am | 2 +-
 disobedience/help.c      | 2 +-
 lib/Makefile.am          | 1 -
 lib/defs.c               | 3 ---
 lib/defs.h               | 1 -
 6 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/configure.ac b/configure.ac
index 5bfe13d..84dffd9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -129,7 +129,7 @@ AC_ARG_WITH([browser],
 
 AC_CACHE_CHECK([default HTML viewer],[rjk_cv_browser],[
   rjk_cv_browser=UNKNOWN
-  for candidate in x-www-browser firefox mozilla konqueror netscape; do
+  for candidate in x-www-browser sensible-browser firefox mozilla konqueror netscape; do
     if type $candidate >/dev/null 2>&1; then
       rjk_cv_browser="$candidate"
       break
diff --git a/disobedience/Makefile.am b/disobedience/Makefile.am
index 335e571..6bba9f8 100644
--- a/disobedience/Makefile.am
+++ b/disobedience/Makefile.am
@@ -19,7 +19,7 @@
 #
 
 bin_PROGRAMS=disobedience
-doc_DATA=disobedience.html
+pkgdata_DATA=disobedience.html
 
 AM_CPPFLAGS=-I${top_srcdir}/lib -I../lib
 AM_CFLAGS=$(GLIB_CFLAGS) $(GTK_CFLAGS)
diff --git a/disobedience/help.c b/disobedience/help.c
index db46db0..55309f0 100644
--- a/disobedience/help.c
+++ b/disobedience/help.c
@@ -31,7 +31,7 @@ void popup_help(void) {
   pid_t pid;
   int w;
 
-  byte_xasprintf(&path, "%s/disobedience.html", docdir);
+  byte_xasprintf(&path, "%s/disobedience.html", pkgdatadir);
   if(!(pid = xfork())) {
     exitfn = _exit;
     if(!xfork()) {
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 8715bb0..2331261 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -101,7 +101,6 @@ definitions.h: Makefile
 	echo "#define SBINDIR \"${sbindir}/\"" >> $@.new
 	echo "#define BINDIR \"${bindir}/\"" >> $@.new
 	echo "#define FINKBINDIR \"${finkbindir}/\"" >> $@.new
-	echo "#define DOCDIR \"${docdir}/\"" >> $@.new
 	@if cmp $@.new $@; then \
 		echo rm -f $@.new; rm -f $@.new; else \
 		echo mv $@.new $@; mv $@.new $@; fi
diff --git a/lib/defs.c b/lib/defs.c
index fd323ad..21dda51 100644
--- a/lib/defs.c
+++ b/lib/defs.c
@@ -56,9 +56,6 @@ const char sbindir[] = SBINDIR;
  */
 const char finkbindir[] = FINKBINDIR;
 
-/** @brief Package documentation directory */
-const char docdir[] = DOCDIR;
-
 #include "versionstring.h"
 
 /*
diff --git a/lib/defs.h b/lib/defs.h
index dd75209..f27e02d 100644
--- a/lib/defs.h
+++ b/lib/defs.h
@@ -30,7 +30,6 @@ extern const char pkgdatadir[];
 extern const char bindir[];
 extern const char sbindir[];
 extern const char finkbindir[];
-extern const char docdir[];
 
 #endif /* DEFS_H */
 
-- 
[mdw]