Skip to content

Commit 6ba4cf0

Browse files
committed
[CSS2] Remove any assumption the Makefile is run on the w3.org server
1 parent 4298c96 commit 6ba4cf0

2 files changed

Lines changed: 5 additions & 27 deletions

File tree

css2/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,4 @@
1010
/css2.pdf
1111
/css2.html
1212
*-e
13+
/dist

css2/Makefile

Lines changed: 4 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -47,23 +47,16 @@ THE_WARNING = <div> \
4747
</div> \
4848
</div>
4949

50-
# WEBROOT = /afs/w3.org/WWW
51-
WEBROOT = $(HOME)/WWW
52-
53-
CSSGROUPDIR = $(WEBROOT)/Style/Group
54-
UPDATES = /Style/css2-updates
55-
56-
THE_UPDATE_DIR = http://www.w3.org$(UPDATES)
57-
UPDATESDIR= $(WEBROOT)$(UPDATES)
58-
TR_DIR = $(WEBROOT)/TR
5950
THE_DATE = $(THE_DAY) $(THE_MONTHNAME) $(THE_YEAR)
6051
THE_ID = $(THE_STYLE)-$(PERMANENT_NAME)-$(THE_YEAR)$(THE_MONTH)$(THE_DAY)
6152
PREV_DATE = $(PREV_YEAR)$(PREV_MONTH)$(PREV_DAY)
6253
THE_PREVIOUS_VERSION = http://www.w3.org/TR/$(PREV_YEAR)/$(PREV_STATUS)-$(PREV_NAME)-$(PREV_DATE)
6354
THE_LOC = $(THE_YEAR)/$(THE_ID)
64-
INSTALLDIR = $(TR_DIR)/$(THE_LOC)
6555
THIS_VERSION = http://www.w3.org/TR/$(THE_LOC)
6656
THE_LATEST_VERSION = http://www.w3.org/TR/$(PERMANENT_NAME)
57+
THE_UPDATE_DIR = http://www.w3.org/Style/css2-updates
58+
59+
INSTALLDIR = dist/
6760

6861
export LC_ALL=en_US.ISO8859-1
6962

@@ -326,10 +319,6 @@ install: all css2.tgz css2.txt css2.zip css2.ps.gz css2.pdf .htaccess
326319
-$(RM) $(INSTALLDIR)/Overview.html
327320
(cd $(INSTALLDIR); $(LN) -s cover.html Overview.html)
328321

329-
link: install
330-
-$(RM) -f $(TR_DIR)/$(PERMANENT_NAME)
331-
(cd $(TR_DIR); $(LN) -s $(THE_LOC) $(PERMANENT_NAME))
332-
333322
install-ps: install css2.ps.gz
334323
$(CP) css2.ps.gz $(INSTALLDIR)
335324

@@ -571,20 +560,8 @@ realclean: clean
571560
depend:
572561
$(HMKDEPEND) $(SPECOBJS)
573562

574-
# Rules to make diff files relative to previous REC and WD.
575-
# htmldiff returns >0 if there are differences, so we ignore the exit code.
576-
577-
PREVREC = ../../../WWW/TR/2011/REC-CSS2-20110607
578-
PREVWD = ../../../WWW/TR/$(PREV_YEAR)/$(PREV_STATUS)-$(PREV_NAME)-$(PREV_DATE)
579-
HTMLDIFF = htmldiff -i -w '<del>' -x '</del>' -y '<ins>' -z '</ins>'
580-
581-
diffs: $(SPECOBJS)
582-
-(cd diffs-rec;\
583-
make PREV=../$(PREVREC) HTMLDIFF="$(HTMLDIFF)" $(SPECOBJS))
584-
-(cd diffs-wd;\
585-
make PREV=../$(PREVWD) HTMLDIFF="$(HTMLDIFF)" $(SPECOBJS))
586563

587564

588-
.PHONY: all install install-all clean realclean checkx diffs
565+
.PHONY: all install install-all clean realclean checkx
589566

590567
##### The following is automatically generated. Do not edit!! ####

0 commit comments

Comments
 (0)