[axel-commits] r105 - in /trunk: axel.1 configure

[phihag-guest at users.alioth.debian.org]

Author: phihag-guest
Date: Tue Apr  7 10:39:20 2009
New Revision: 105

URL: http://svn.debian.org/wsvn/axel/?sc=1&rev=105
Log:
Correct and document system-wide configuration file location
Fix special character handling in configure

Modified:
    trunk/axel.1
    trunk/configure

Modified: trunk/axel.1
URL: http://svn.debian.org/wsvn/axel/trunk/axel.1?rev=105&op=diff
==============================================================================
--- trunk/axel.1 (original)
+++ trunk/axel.1 Tue Apr  7 10:39:20 2009
@@ -129,7 +129,8 @@
 
 .SH FILES
 .PP
-\fI/etc/axelrc\fP System-wide configuration file
+\fI/etc/axelrc\fP System-wide configuration file. Note that development versions
+place this file in /usr/local/etc.
 .PP
 \fI~/.axelrc\fP Personal configuration file
 .PP

Modified: trunk/configure
URL: http://svn.debian.org/wsvn/axel/trunk/configure?rev=105&op=diff
==============================================================================
--- trunk/configure (original)
+++ trunk/configure Tue Apr  7 10:39:20 2009
@@ -8,7 +8,7 @@
 
 prefix='/usr/local'
 bindir='$prefix/bin'
-etcdir='/etc'
+etcdir='$prefix/etc'
 mandir='$prefix/share/man'
 locale='$prefix/share/locale'
 
@@ -42,9 +42,9 @@
 	fi
 	
 	keyname=$(expr "$e" : '\(.*\)=.*' | sed 's/[^a-z0-9_]/_/g')
-	value=$(expr "$e" : '.*=\(.*\)' | sed 's/"/_/g')
+	value=$(expr "$e" : '.*=\(.*\)' | sed "s/'/_/g")
 	
-	eval "$keyname=${value}"
+	eval "$keyname='$value'"
 	shift;
 done
 
@@ -53,6 +53,10 @@
 etcdir=`eval echo $etcdir`
 mandir=`eval echo $mandir`
 locale=`eval echo $locale`
+if test "$etcdir" = "/usr/etc"; then
+	# FHS explicitely forbids /usr/etc
+	etcdir='/etc'
+fi
 
 cat<<EOF>Makefile.settings
 ## Axel settings, generated by configure