From: Jonathan McDowell Date: Sun, 15 Aug 2004 20:39:44 +0000 (+0000) Subject: autoconf onak-mail.pl config X-Git-Url: https://git.sommitrealweird.co.uk/onak.git/commitdiff_plain/2ded7b1e4475beb7a3f132deeeae807861bdc399?ds=sidebyside autoconf onak-mail.pl config Change onak-mail.pl to be built with the config file location as supplied to configure. --- diff --git a/Makefile.in b/Makefile.in index fe7cfd4..de1420b 100644 --- a/Makefile.in +++ b/Makefile.in @@ -12,7 +12,7 @@ DBTYPE = @DBTYPE@ LIBS = @LIBS@ prefix ?= @prefix@ -PROGS = add lookup gpgwww onak splitkeys +PROGS = add lookup gpgwww onak splitkeys onak-mail.pl CORE_OBJS = armor.o charfuncs.o decodekey.o getcgi.o hash.o keydb_$(DBTYPE).o \ keyid.o keyindex.o ll.o mem.o onak-conf.o parsekey.o sha1.o md5.o \ log.o photoid.o wordlist.o @@ -54,6 +54,10 @@ onak: onak.o merge.o cleankey.o $(CORE_OBJS) onak-conf.o: onak-conf.c onak-conf.h $(CC) $(CFLAGS) -DCONFIGFILE=\"@sysconfdir@/onak.conf\" -c onak-conf.c +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 + clean: $(RM) -f $(PROGS) $(OBJS) Makefile.bak testparse maxpath *.core core \ gpgwww.o add.o lookup.o main.o maxpath.o onak.o sixdegrees \ diff --git a/onak-mail.pl b/onak-mail.pl.in old mode 100755 new mode 100644 similarity index 98% rename from onak-mail.pl rename to onak-mail.pl.in index 6799b3d..7ad5960 --- a/onak-mail.pl +++ b/onak-mail.pl.in @@ -21,7 +21,7 @@ my %config; # sub readconfig { - open(CONFIG, "/home/noodles/projects/onak/onak.conf") or + open(CONFIG, "@CONFIG@") or die "Can't read config file: $!"; while () {