[or-cvs] r23540: {website} Update the Makefile now that we feed both stable and dev web (website/trunk)

[Sebastian Hahn <tor-svn-commits@xxxxxxxxxxxxxxxxx>]

Author: sebastian
Date: 2010-10-10 01:19:11 +0000 (Sun, 10 Oct 2010)
New Revision: 23540

Modified:
   website/trunk/Makefile
   website/trunk/Makefile.common
Log:
Update the Makefile

now that we feed both stable and dev website from the same git
repository there's no need to provide a second path for it

Modified: website/trunk/Makefile
===================================================================
--- website/trunk/Makefile	2010-10-10 01:18:02 UTC (rev 23539)
+++ website/trunk/Makefile	2010-10-10 01:19:11 UTC (rev 23540)
@@ -1,23 +1,15 @@
 # Directions for building the website:
 #
-# FIXME: this is incorrect, because maint-0.2.1 and master merged
-# 1. Clone the Tor git repository, switch to branch maint-0.2.1, and
-# make TORSVNSTABLE point to it: 
+# 1. Clone the Tor git repository and make TORGIT point to it:
 #
-# 	git clone git://git.torproject.org/tor/ tor-stable
-# 	cd tor-stable && git checkout maint-0.2.1
-#
-# 2. Clone the Tor git repository again and make TORGIT point to it:
-#
 # 	git clone git://git.torproject.org/tor/ tor
 #
-# 3. Edit include/versions.wmi or others if you like
-# 4. Update STABLETAG and DEVTAG below if there is a new git tag
-# 5. make
-# 6. ./publish
+#    Note that you will need to point to the actual .git directory.
+# 2. Edit include/versions.wmi or others if you like
+# 3. Update STABLETAG and DEVTAG below if there is a new git tag
+# 4. make
+# 5. ./publish
 
-# FIXME: these are the same
-export TORSVNSTABLE=/home/phobos/onionrouter/onionrouter/tor/
 export TORGIT=/home/phobos/onionrouter/onionrouter/tor.git/.git
 export STABLETAG=tor-0.2.2.17-alpha
 export DEVTAG=tor-0.2.2.17-alpha

Modified: website/trunk/Makefile.common
===================================================================
--- website/trunk/Makefile.common	2010-10-10 01:18:02 UTC (rev 23539)
+++ website/trunk/Makefile.common	2010-10-10 01:19:11 UTC (rev 23540)
@@ -13,7 +13,6 @@
           -I $(WMLBASE)/include \
           -D DOCROOT=$(WMLBASE) \
           -D IMGROOT=$(WMLBASE)/images \
-          -D TORSVNSTABLE=$(TORSVNSTABLE) \
           -D TORGIT=$(TORGIT)\
           -D DEVTAG=$(DEVTAG) \
           -D STABLETAG=$(STABLETAG)