diff options
| author | Nick Mathewson <nickm@torproject.org> | 2006-09-24 21:45:02 +0000 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2006-09-24 21:45:02 +0000 |
| commit | b1ad605780cb026f44040c73deebff525c44c66e (patch) | |
| tree | da9bfc572a7fd059807888ad335b7c08cf7a265e | |
| parent | bda137501e987926f5dbdb9fe7287201f631ccde (diff) | |
| download | tor-b1ad605780cb026f44040c73deebff525c44c66e.tar.gz tor-b1ad605780cb026f44040c73deebff525c44c66e.zip | |
Build correctly for use on OS X platforms with case-sensitive filesystems
svn:r8487
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | Makefile.am | 3 | ||||
| -rw-r--r-- | configure.in | 6 |
3 files changed, 8 insertions, 3 deletions
@@ -39,6 +39,8 @@ Changes in version 0.1.2.2-alpha - 2006-??-?? instead of "X resolved to X". - Prevent the 'exitlist' script from printing the same result more than once. + - Build correctly for use on OS X platforms with case-sensitive + filesystems. o Documentation - Documented (and renamed) ServerDNSSearchDomains and diff --git a/Makefile.am b/Makefile.am index 6179291fd1..e6c491e424 100644 --- a/Makefile.am +++ b/Makefile.am @@ -46,6 +46,9 @@ dist-osx: if [ "x$(sysconfdir)" != 'x/Library' ]; then \ echo "Configure with --sysconfdir=/Library, please"; \ exit 1; \ + fi; \ + if [ "x$(CONFDIR)" != 'x/Library/Tor' ]; then \ + echo "Configure with CONFDIR=/Library/Tor, please"; \ fi $(MAKE) all VERSION=$(VERSION) sh ./contrib/osx/package.sh diff --git a/configure.in b/configure.in index 7527bed5cc..f177ad7386 100644 --- a/configure.in +++ b/configure.in @@ -716,7 +716,9 @@ if test "x$exec_prefix" = "xNONE"; then exec_prefix=$prefix fi -CONFDIR=`eval echo $sysconfdir/tor` +if test "x$CONFDIR" = "x"; then + CONFDIR=`eval echo $sysconfdir/tor` +fi AC_SUBST(CONFDIR) AH_TEMPLATE([CONFDIR],[tor's configuration directory]) AC_DEFINE_UNQUOTED(CONFDIR,"$CONFDIR") @@ -742,8 +744,6 @@ fi # Add these in when you feel like fun. #CFLAGS="$CFLAGS -Wbad-function-cast -Werror -Wdeclaration-after-statement -Wold-style-definition" -echo "confdir: $CONFDIR" - AC_OUTPUT(Makefile tor.spec contrib/tor.sh contrib/torctl contrib/torify contrib/tor.logrotate contrib/Makefile contrib/osx/Makefile contrib/osx/TorBundleDesc.plist contrib/osx/TorBundleInfo.plist contrib/osx/TorDesc.plist contrib/osx/TorInfo.plist contrib/osx/TorStartupDesc.plist src/config/torrc.sample doc/tor.1 src/Makefile doc/Makefile doc/design-paper/Makefile src/config/Makefile src/common/Makefile src/or/Makefile src/win32/Makefile src/tools/Makefile contrib/suse/Makefile contrib/suse/tor.sh) if test -x /usr/bin/perl && test -x ./contrib/updateVersions.pl ; then |