From cdaef23b517d52d431f636e6e0f8b30a64866dd1 Mon Sep 17 00:00:00 2001
From: Joey Schulze <joey@infodrom.org>
Date: Thu, 6 Sep 2001 11:09:10 +0000
Subject: [PATCH] Some design updates, should be more modern, I guess.

---
 Makefile     | 12 ++++++------
 src/Makefile | 13 +++++++------
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/Makefile b/Makefile
index 60295cf..fd3019b 100644
--- a/Makefile
+++ b/Makefile
@@ -13,12 +13,12 @@ TEST = $(HOME)/public_html/luonnotar
 #TEST = /var/lib/webspace/www.infodrom.ffis.de/new
 
 FILES = --exclude "CVS/" --exclude "*imgdot-1x1-transp-ffffff.gif" --exclude "*imgdot-1x1-transp.gif" --include "*/"
-FILES+= --include "*.jpg" --include "*.html" --include "*.shtml" --include "*.php3" --include "*.gif"
-FILES+= --include "*.png"
+FILES+= --include "*.html" --include "*.shtml" --include "*.php3"
+FILES+= --include "*.png" --include "*.gif" --include "*.jpg"
 FILES+= --exclude "*"
 
 build:
-	cd src && make all
+	make -C src all
 
 test:
 	false
@@ -41,8 +41,8 @@ install: fix
 
 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:
-	cd src && make rdepend
+	make -C src rdepend
diff --git a/src/Makefile b/src/Makefile
index 62d505b..beec9ad 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -16,26 +16,27 @@ 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 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
+	-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
 
 install:
-	cd $(ROOT_PREFIX).. && make install
+	make -C $(ROOT_PREFIX).. install
 
 test:
-	cd $(ROOT_PREFIX).. && make test
+	make -C $(ROOT_PREFIX).. test
 
 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 && cd $$d && make rdepend); fi; done
+	test -z "$(DIRS)" || for d in "" $(DIRS); do if [ -n "$$d" ]; then (cp Makefile $$d && make -C $$d rdepend); fi; done
 
 include .depend
-- 
2.20.1