[or-cvs] Forward-port OSX packaging stuff from maint branch

[Nick Mathewson]

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

Modified Files:
	Makefile.am configure.in 
Log Message:
Forward-port OSX packaging stuff from maint branch

Index: Makefile.am
===================================================================
RCS file: /home/or/cvsroot/tor/Makefile.am,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- Makefile.am	18 Dec 2004 23:04:55 -0000	1.16
+++ Makefile.am	5 Jan 2005 02:46:24 -0000	1.17
@@ -24,6 +24,22 @@
 	mv $$RPM_BUILD_DIR/RPMS/*/* .;                          \
 	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
+
 doxygen:
 	doxygen && cd doc/doxygen/latex && make
 

Index: configure.in
===================================================================
RCS file: /home/or/cvsroot/tor/configure.in,v
retrieving revision 1.157
retrieving revision 1.158
diff -u -d -r1.157 -r1.158
--- configure.in	17 Dec 2004 21:17:44 -0000	1.157
+++ configure.in	5 Jan 2005 02:46:24 -0000	1.158
@@ -244,7 +244,7 @@
 
 echo "confdir: $CONFDIR"
 
-AC_OUTPUT(Makefile tor.spec contrib/tor.sh contrib/torctl contrib/torify contrib/Makefile 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)
+AC_OUTPUT(Makefile tor.spec contrib/tor.sh contrib/torctl contrib/torify contrib/Makefile contrib/osx/Makefile contrib/osx/TorBundleDesc.plist contrib/osx/TorBundleInfo.plist contrib/osx/TorDesc.plist contrib/osx/TorInfo.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)
 
 if test -x /usr/bin/perl && test -x ./contrib/updateVersions.pl ; then
   ./contrib/updateVersions.pl