support for --sysconfdir; use this for locating the mime.types

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 39b948559964de58229cc1b568c3eea855078b2d..3ca5e80b0602ea73decb6b92bc07f31a84b15b37 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,13 @@
+2001-06-18 [alfons]
+
+       * src/Makefile.am,
+         src/procmime.c
+               added --sysconfdir to CPPFLAGS for pointing to the correct
+               location of mime.types. 
+
+               NOTE: make sure you use --sysconfdir when running ./autogen.sh
+               or ./configure!
+

 2001-06-18 [hoa]
 
        * src/summaryview.c
 2001-06-18 [hoa]
 
        * src/summaryview.c

diff --git a/src/Makefile.am b/src/Makefile.am
index 9fa0c100342cd29c7f270bf286c5bb7cb21eb10d..1d0e6ca7e486aa9aa021db61f0705ec1aa2960a3 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -154,7 +154,8 @@ sylpheed_LDADD = \
 CPPFLAGS = \
        -DLOCALEDIR=\""$(localedir)"\" \
        -DMANUALDIR=\""$(manualdir)"\" \
 CPPFLAGS = \
        -DLOCALEDIR=\""$(localedir)"\" \
        -DMANUALDIR=\""$(manualdir)"\" \

-       -DHOST_ALIAS=\""$(host_alias)"\"
+       -DHOST_ALIAS=\""$(host_alias)"\" \
+       -DSYSCONFDIR=\""$(sysconfdir)"\"

 
 YFLAGS = -d
 
 
 YFLAGS = -d
 

diff --git a/src/procmime.c b/src/procmime.c
index 6d03f225bd39f824317f15f5774b73c7e41e793b..af71a81e392d645311049d261496322854b5c870 100644 (file)
--- a/src/procmime.c
+++ b/src/procmime.c
@@ -792,8 +792,8 @@ static GList *procmime_get_mime_type_list(void)
        gchar *p, *delim;
        MimeType *mime_type;
 
        gchar *p, *delim;
        MimeType *mime_type;
 

-       if ((fp = fopen("/etc/mime.types", "r")) == NULL) {
-               FILE_OP_ERROR("/etc/mime.types", "fopen");
+       if ((fp = fopen(SYSCONFDIR "/mime.types", "r")) == NULL) {
+               FILE_OP_ERROR(SYSCONFDIR "/mime.types", "fopen");

                return NULL;
        }
 
                return NULL;
        }