shishi/db Makefile.am init.c

[shishi-commit]

CVSROOT:        /cvsroot/shishi
Module name:    shishi
Branch:         
Changes by:     Simon Josefsson <address@hidden>        03/11/30 12:42:10

Modified files:
        db             : Makefile.am init.c 

Log message:
        Fix default path, use $localstatedir/shishi (e.g., 
/usr/local/var/shishi).

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/shishi/shishi/db/Makefile.am.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/shishi/shishi/db/init.c.diff?tr1=1.3&tr2=1.4&r1=text&r2=text

Patches:
Index: shishi/db/Makefile.am
diff -u shishi/db/Makefile.am:1.6 shishi/db/Makefile.am:1.7
--- shishi/db/Makefile.am:1.6   Fri Nov 28 21:43:26 2003
+++ shishi/db/Makefile.am       Sun Nov 30 12:42:09 2003
@@ -22,6 +22,7 @@
 
 DEFS = -DLOCALEDIR=\"$(localedir)\" \
        -DSYSTEMCFGFILE=\"$(sysconfdir)/shisa.conf\" \
+       -DDEFAULTDBPATH=\"$(localstatedir)/$(PACKAGE)\" \
        @DEFS@
 
 include_HEADERS = shisa.h
Index: shishi/db/init.c
diff -u shishi/db/init.c:1.3 shishi/db/init.c:1.4
--- shishi/db/init.c:1.3        Fri Nov 28 19:23:23 2003
+++ shishi/db/init.c    Sun Nov 30 12:42:10 2003
@@ -115,7 +115,7 @@
 
   if ((*dbh)->ndbs == 0)
     {
-      rc = shisa_cfg_db (*dbh, "file foo allow-create");
+      rc = shisa_cfg_db (*dbh, "file " DEFAULTDBPATH);
       if (rc != SHISA_OK)
        return rc;
     }