From: Jonathan McDowell Date: Tue, 14 Sep 2004 16:16:52 +0000 (+0000) Subject: Configure basic onak.conf using autoconf info. X-Git-Url: https://git.sommitrealweird.co.uk/onak.git/commitdiff_plain/a047e3e158d560af079bec920460711d8222317c Configure basic onak.conf using autoconf info. Write a basic onak.conf that has paths from the autoconf info, rather than hard coded paths to my homedir. --- diff --git a/Makefile.in b/Makefile.in index 5cb723f..01169b2 100644 --- a/Makefile.in +++ b/Makefile.in @@ -11,6 +11,7 @@ DBTYPE = @DBTYPE@ # LIBS = @LIBS@ prefix ?= @prefix@ +exec_prefix ?= @exec_prefix@ PROGS = add lookup gpgwww onak splitkeys onak-mail.pl stripkey CORE_OBJS = armor.o charfuncs.o decodekey.o getcgi.o hash.o keydb_$(DBTYPE).o \ @@ -22,7 +23,7 @@ SRCS = armor.c parsekey.c merge.c keyid.c md5.c sha1.c main.c getcgi.c mem.c \ gpgwww.c onak-conf.c charfuncs.c sendsync.c log.c photoid.c \ wordlist.c cleankey.c cleanup.c -all: .depend $(PROGS) testparse maxpath sixdegrees splitkeys +all: .depend $(PROGS) testparse maxpath sixdegrees splitkeys onak.conf splitkeys: splitkeys.o $(CORE_OBJS) $(CC) $(LDFLAGS) -o splitkeys splitkeys.o $(CORE_OBJS) $(LIBS) @@ -61,10 +62,15 @@ onak-mail.pl: onak-mail.pl.in sed 's:@CONFIG@:@sysconfdir@/onak.conf:g' < onak-mail.pl.in > onak-mail.pl chmod +x onak-mail.pl +onak.conf: onak.conf.in + sed -e 's:@BINDIR@:@bindir@:g' \ + -e 's:@STATEDIR@:@localstatedir@:g' \ + < onak.conf.in > onak.conf + clean: $(RM) -f $(PROGS) $(OBJS) Makefile.bak testparse maxpath *.core core \ gpgwww.o add.o lookup.o main.o maxpath.o onak.o sixdegrees \ - sixdegrees.o splitkeys.o stripkey.o + sixdegrees.o splitkeys.o stripkey.o onak.conf distclean: clean $(RM) -f Makefile .depend config.{log,status,h} diff --git a/onak.conf b/onak.conf.in similarity index 95% rename from onak.conf rename to onak.conf.in index 8668c80..56533ce 100644 --- a/onak.conf +++ b/onak.conf.in @@ -2,9 +2,9 @@ # onak configuration file. Taken from pksd.conf as a starting point. # -pks_bin_dir /home/noodles/projects/onak/ -db_dir /home/noodles/pgp/db/ -logfile /home/noodles/pgp/onak.log +pks_bin_dir @BINDIR@ +db_dir @STATEDIR@/lib/onak +logfile @STATEDIR@/log/onak.log # Loglevel : 0 is highest debug, default is 3, nothing is 7+ loglevel 0