Changes required to make the pages work on luonnotar

diff --git a/Makefile b/Makefile
index ad1260f..e39b685 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,33 +1,37 @@
-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 "*.php3"
+FILES+= --include "*.jpg" --include "*.gif" --include "*.png"
 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

diff --git a/src/Makefile b/src/Makefile
index 71b10c6..73828ab 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -16,14 +16,21 @@ IFLAGS = -I. -I$(ROOT_PREFIX)../Styles
        $(ROOT_PREFIX)../bin/fixsuffix $*.html
 
 all: $(FILES)
-       test -z "$(DIRS)" || for d in "" $(DIRS); do if [ -n "$$d" ]; then (cp Makefile $$d && cd $$d && make all); fi; done
+       test -z "$(DIRS)" || for d in "" $(DIRS); do if [ -n "$$d" ]; then (cp Makefile $$d && make -C $$d all); fi; done
+
+dir: $(FILES)
 
 clean:
-       rm -f $(FILES) $(SFILES) $(PFILES) .depend *.imgdot-1x1-transp.gif
-       test -z "$(DIRS)" || for d in "" $(DIRS); do if [ -n "$$d" ]; then (cp Makefile $$d && cd $$d && make clean); fi; done
+       -rm -f $(FILES) $(SFILES) $(PFILES) .depend *.imgdot-1x1-transp.gif imgdot-1x1-transp.gif imgdot-1x1-transp-ffffff.gif
+       -rm -f *~
+       test -z "$(DIRS)" || for d in "" $(DIRS); do if [ -n "$$d" ]; then (cp Makefile $$d && make -C $$d clean); fi; done
        test -z "$(ROOT_PREFIX)" || rm -f Makefile
 
 depend .depend:
        $(ROOT_PREFIX)../bin/wmldepend.sh $(IFLAGS) $(WML_FILES) > .depend
 
+rdepend:
+       make depend
+       test -z "$(DIRS)" || for d in "" $(DIRS); do if [ -n "$$d" ]; then (cp Makefile $$d && make -C $$d rdepend); fi; done
+
 include .depend