[or-cvs] More mac installer fixes

Nick Mathewson nickm at seul.org
Tue Jan 4 06:22:15 UTC 2005


Update of /home/or/cvsroot/tor
In directory moria.mit.edu:/tmp/cvs-serv29801

Modified Files:
      Tag: tor-0_0_9-patches
	Makefile.am 
Log Message:
More mac installer fixes

Index: Makefile.am
===================================================================
RCS file: /home/or/cvsroot/tor/Makefile.am,v
retrieving revision 1.15.2.2
retrieving revision 1.15.2.3
diff -u -d -r1.15.2.2 -r1.15.2.3
--- Makefile.am	19 Dec 2004 04:26:28 -0000	1.15.2.2
+++ Makefile.am	4 Jan 2005 06:22:13 -0000	1.15.2.3
@@ -25,6 +25,18 @@
 	rm -rf $$RPM_BUILD_DIR
 
 dist-osx:
+	@if [ "x$(prefix)" != 'x/Library/Tor' ]; then \
+	  echo "Configure with --prefix=/Library/Tor, please"; \
+	  exit 1; \
+	fi; \
+	if [ "x$(bindir)" != 'x/Library/Tor' ]; then \
+	  echo "Configure with --bindir=/Library/Tor, please"; \
+	  exit 1; \
+	fi; \
+	if [ "x$(sysconfdir)" != 'x/Library' ]; then \
+	  echo "Configure with --sysconfdir=/Library, please"; \
+	  exit 1; \
+	fi
 	$(MAKE) all
 	VERSION=$(VERSION) sh ./contrib/osx/package.sh
 
@@ -37,4 +49,3 @@
 	        src/common/*.h                 \
 		src/common/[^s]*.c             \
 		src/or/[^t]*.[ch] src/or/t*.c
-



More information about the tor-commits mailing list