From: megacz <megacz@0d961d1b-a432-0410-8fea-cc29f225fe07>
Date: Wed, 20 Jun 2007 02:20:35 +0000 (+0000)
Subject: typo
X-Git-Url: https://git.hcoop.net/hcoop/zz_old/modwaklog.git/commitdiff_plain/bce7d4d9aa632d757285cc408933ed39f8301539

typo

git-svn-id: https://modwaklog.svn.sourceforge.net/svnroot/modwaklog/trunk/modwaklog@55 0d961d1b-a432-0410-8fea-cc29f225fe07
---

diff --git a/VERSION b/VERSION
index a4e4a3e..8b12291 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-SVN_20070616
+SVN_20070619
diff --git a/debian/rules b/debian/rules
index afec231..9b4028a 100644
--- a/debian/rules
+++ b/debian/rules
@@ -8,44 +8,36 @@ else
 	CFLAGS += -O2
 endif
 
-build-apache13:
+default:binary
+
+apache13:
 	dh_testdir
 	chmod +x regen.sh
 	./regen.sh
-	make clean
 	./configure \
 	  --with-afs-libs=/usr/lib/afs \
 	  --with-afs-headers=/usr/include/afs \
 	  --with-apxs=/usr/bin/apxs
+	make clean
 	$(MAKE)
+	dh_installdirs
+	mkdir -p debian/libapache-mod-waklog/usr/lib/apache/1.3/
+	mkdir -p debian/libapache-mod-waklog/etc/apache/conf.d/
+	cp mod_waklog.so debian/libapache-mod-waklog/usr/lib/apache/1.3/
+	cp debian/waklog.load debian/libapache-mod-waklog/etc/apache/conf.d/waklog.conf
 
-build-apache20:
+apache20:
 	dh_testdir
 	chmod +x regen.sh
 	./regen.sh
-	make clean
 	./configure \
 	  --with-afs-libs=/usr/lib/afs \
 	  --with-afs-headers=/usr/include/afs \
 	  --with-apache-headers=/usr/include/apache2 \
 	  --with-apxs=/usr/bin/apxs2
+	make clean
 	$(MAKE)
 	mv .libs/mod_waklog.so .; true
-
-apache13: build-apache13
-	dh_testdir
-	dh_testroot
-	dh_clean -k  --exclude ./_darcs/current/Makefile.orig --exclude ./Makefile.orig
-	dh_installdirs
-	mkdir -p debian/libapache-mod-waklog/usr/lib/apache/1.3/
-	mkdir -p debian/libapache-mod-waklog/etc/apache/conf.d/
-	cp mod_waklog.so debian/libapache-mod-waklog/usr/lib/apache/1.3/
-	cp debian/waklog.load debian/libapache-mod-waklog/etc/apache/conf.d/waklog.conf
-
-apache20: build-apache20
-	dh_testdir
-	dh_testroot
-	dh_clean -k  --exclude ./_darcs/current/Makefile.orig --exclude ./Makefile.orig
 	dh_installdirs
 	mkdir -p debian/libapache2-mod-waklog/usr/lib/apache2/modules/
 	mkdir -p debian/libapache2-mod-waklog/etc/apache2/mods-available
diff --git a/mod_waklog.c b/mod_waklog.c
index 70b202f..0a0fae5 100644
--- a/mod_waklog.c
+++ b/mod_waklog.c
@@ -787,7 +787,7 @@ static void *waklog_merge_server_config(MK_POOL *p, void *parent_conf, void *new
 
   merged->usertokens = nconf->usertokens == WAKLOG_UNSET ? pconf->usertokens : nconf->usertokens;
 
-  merged->disable_token_cache = nconf->disable_token_cache == WAKLOG_UNSET ? pconf->udisable_token_cache : nconf->disable_token_cache;
+  merged->disable_token_cache = nconf->disable_token_cache == WAKLOG_UNSET ? pconf->disable_token_cache : nconf->disable_token_cache;
 
   merged->keytab = nconf->keytab ==  WAKLOG_UNSET ? ap_pstrdup(p, pconf->keytab) : 
     ( nconf->keytab == WAKLOG_UNSET ? WAKLOG_UNSET : ap_pstrdup(p, pconf->keytab) );