Define font size and line height

[infodrom.org/infocon.infodrom.org] / Makefile

diff --git a/Makefile b/Makefile
index ad1260f..a4e772b 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,33 +1,39 @@
-DEST = /var/lib/webspace/infocon.infodrom.org
+hostname=$(shell hostname)
 
-TEST = $(HOME)/public_html/ic/infocon
+ifeq ($(hostname),luonnotar)
+DEST = /var/www/infocon.infodrom.org
+TEST = $(HOME)/luonnotar_html/new/infocon
+else
+DEST = $(HOME)/public_html/new/infocon
+TEST = $(HOME)/public_html/new/infocon
+endif
 
-FILES = --exclude "CVS/" --exclude "*imgdot-1x1-transp.gif" --include "*/"
-FILES+= --include "*.jpg" --include "*.html" --include "*.shtml" --include "*.php3" --include "*.gif"
+FILES = --exclude "CVS/" --exclude "*imgdot-1x1-transp-ffffff.gif" --exclude "*imgdot-1x1-transp.gif" --include "*/"
+FILES+= --include "*.html" --include "*.shtml" --include "*.php"
+FILES+= --include "*.jpg" --include "*.gif" --include "*.png"
+FILES+= --include "favicon.ico"
+FILES+= --include "infocon.css"
 FILES+= --exclude "*"
 
 build:
-       cd src && make all
+       make -C src all
 
 test:
-       test -d $(TEST) || mkdir $(TEST)
+       test -d $(TEST) || mkdir -p $(TEST)
        rsync -lptr $(FILES) src/ $(TEST)/
 #      cd src && for f in *.html; do cp $$f $(TEST)/$$f; done
 
 fix:
-#      for f in src/index.*.php3; do \
-#        sed '1,/width="40"/ s/width="40"/width="250"/' < $$f > tmp; \
-#        mv -f tmp $$f; \
-#        sed '1,/width="40"/ s/width="40"/width="400"/' < $$f > tmp; \
-#        mv -f tmp $$f; \
-#      done
 
 install: fix
-       test -d $(DEST) || mkdir $(DEST)
+       test -d $(DEST) || mkdir -p $(DEST)
        rsync -lptr $(FILES) src/ $(DEST)/
 #      cd src && for f in *.html; do cp $$f $(DEST)/$$f; done
 
 clean:
        -rm -f `find -name '*~'` `find -name '.?*.swp'`
-       -cd src && make clean
-       -cd Styles && make clean
+       -make -C src clean
+       -make -C Styles clean
+
+depend:
+       make -C src rdepend