Skip to content

Commit ca9a2e4

Browse files
committed
[CSS2] Directly check-in .htaccess
1 parent cbc4d90 commit ca9a2e4

2 files changed

Lines changed: 9 additions & 12 deletions

File tree

css2/.htaccess

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
DirectoryIndex cover.html
2+
<Files ~ "\.html">
3+
ForceType 'text/html; charset=iso-8859-1'
4+
</Files>
5+
<Files ~ "\.txt">
6+
ForceType 'text/plain; charset=iso-8859-1'
7+
</Files>

css2/Makefile

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -313,29 +313,19 @@ build/warning:
313313
# -@(cd images; for i in *.gif; do $(LN) -s $$i "`basename $$i .gif`" 2>//dev/null; done)
314314
# touch images/links.ok
315315

316-
install: all css2.tgz css2.txt css2.zip css2.ps.gz css2.pdf $(INSTALLDIR)/.htaccess
316+
install: all css2.tgz css2.txt css2.zip css2.ps.gz css2.pdf .htaccess
317317
@if [ -z "$(INSTALLDIR)" ]; then\
318318
echo >&2;\
319319
echo "*** No target directory specified" >&2;\
320320
echo "*** Please use: make install INSTALLDIR=<target-dir>" >&2;\
321321
exit 1;\
322322
fi
323323
@if [ ! -d $(INSTALLDIR) ]; then mkdir -p $(INSTALLDIR);fi
324-
$(CP) css2.txt css2.zip css2.ps.gz css2.pdf css2.tgz $(INSTALLDIR)
324+
$(CP) css2.txt css2.zip css2.ps.gz css2.pdf css2.tgz .htaccess $(INSTALLDIR)
325325
cat css2.tgz | (cd $(INSTALLDIR); $(TAR) xvf -)
326326
-$(RM) $(INSTALLDIR)/Overview.html
327327
(cd $(INSTALLDIR); $(LN) -s cover.html Overview.html)
328328

329-
$(INSTALLDIR)/.htaccess:
330-
mkdir -p $(INSTALLDIR)
331-
echo "DirectoryIndex cover.html" >$@
332-
echo "<Files ~ \"\.html\">" >>$@
333-
echo "ForceType 'text/html; charset=iso-8859-1'" >>$@
334-
echo "</Files>" >>$@
335-
echo "<Files ~ \"\.txt\">" >>$@
336-
echo "ForceType 'text/plain; charset=iso-8859-1'" >>$@
337-
echo "</Files>" >>$@
338-
339329
link: install
340330
-$(RM) -f $(TR_DIR)/$(PERMANENT_NAME)
341331
(cd $(TR_DIR); $(LN) -s $(THE_LOC) $(PERMANENT_NAME))

0 commit comments

Comments
 (0)