Browse code

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

Sebastian Hahn authored on10/10/2010 03:19:11
Showing2 changed files
... ...
@@ -1,23 +1,15 @@
1 1
 # Directions for building the website:
2 2
 #
3
-# FIXME: this is incorrect, because maint-0.2.1 and master merged
4
-# 1. Clone the Tor git repository, switch to branch maint-0.2.1, and
5
-# make TORSVNSTABLE point to it: 
6
-#
7
-# 	git clone git://git.torproject.org/tor/ tor-stable
8
-# 	cd tor-stable && git checkout maint-0.2.1
9
-#
10
-# 2. Clone the Tor git repository again and make TORGIT point to it:
3
+# 1. Clone the Tor git repository and make TORGIT point to it:
11 4
 #
12 5
 # 	git clone git://git.torproject.org/tor/ tor
13 6
 #
14
-# 3. Edit include/versions.wmi or others if you like
15
-# 4. Update STABLETAG and DEVTAG below if there is a new git tag
16
-# 5. make
17
-# 6. ./publish
7
+#    Note that you will need to point to the actual .git directory.
8
+# 2. Edit include/versions.wmi or others if you like
9
+# 3. Update STABLETAG and DEVTAG below if there is a new git tag
10
+# 4. make
11
+# 5. ./publish
18 12
 
19
-# FIXME: these are the same
20
-export TORSVNSTABLE=/home/phobos/onionrouter/onionrouter/tor/
21 13
 export TORGIT=/home/phobos/onionrouter/onionrouter/tor.git/.git
22 14
 export STABLETAG=tor-0.2.2.17-alpha
23 15
 export DEVTAG=tor-0.2.2.17-alpha
... ...
@@ -13,7 +13,6 @@ WMLOPT  = \
13 13
           -I $(WMLBASE)/include \
14 14
           -D DOCROOT=$(WMLBASE) \
15 15
           -D IMGROOT=$(WMLBASE)/images \
16
-          -D TORSVNSTABLE=$(TORSVNSTABLE) \
17 16
           -D TORGIT=$(TORGIT)\
18 17
           -D DEVTAG=$(DEVTAG) \
19 18
           -D STABLETAG=$(STABLETAG)