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

diff --git a/configure.ac b/configure.ac
index 5bfe13da87c65df4b387197b1cb4cd888eb362bf..84dffd928698481479def80b8ae637031605ff61 100644 (file)
--- 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
 
 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
     if type $candidate >/dev/null 2>&1; then
       rjk_cv_browser="$candidate"
       break

diff --git a/disobedience/Makefile.am b/disobedience/Makefile.am
index 335e5711d5dfe7fbbcbe4b0d8ef05de9dec6cef9..6bba9f8d796f19d76fe99a50294359aafdfb3984 100644 (file)
--- a/disobedience/Makefile.am
+++ b/disobedience/Makefile.am
@@ -19,7 +19,7 @@
 #
 
 bin_PROGRAMS=disobedience
 #
 
 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)
 
 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 db46db0f2d10bcdf6ec01d9e31b2227605b3b260..55309f0760fd375d77c23b1621d098a007b5005c 100644 (file)
--- a/disobedience/help.c
+++ b/disobedience/help.c
@@ -31,7 +31,7 @@ void popup_help(void) {
   pid_t pid;
   int w;
 
   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()) {
   if(!(pid = xfork())) {
     exitfn = _exit;
     if(!xfork()) {

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 8715bb0710d295130622f813888313344d662d6f..23312612fcd133490ffe1b963137d6b2f8ec280f 100644 (file)
--- 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 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
        @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 fd323ad552c775f3de88091e1603b76b3797d290..21dda51a812e1580d4a425d7859d2b5f2ab7aefc 100644 (file)
--- a/lib/defs.c
+++ b/lib/defs.c
@@ -56,9 +56,6 @@ const char sbindir[] = SBINDIR;
  */
 const char finkbindir[] = FINKBINDIR;
 
  */
 const char finkbindir[] = FINKBINDIR;
 

-/** @brief Package documentation directory */
-const char docdir[] = DOCDIR;
-

 #include "versionstring.h"
 
 /*
 #include "versionstring.h"
 
 /*

diff --git a/lib/defs.h b/lib/defs.h
index dd75209c7813c27fe875676e69e4eb280b4a0bd2..f27e02d114bfb946aae5f2596f7a4c0640a698b5 100644 (file)
--- 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 bindir[];
 extern const char sbindir[];
 extern const char finkbindir[];

-extern const char docdir[];

 
 #endif /* DEFS_H */
 
 
 #endif /* DEFS_H */