Index: Makefile.in
===================================================================
RCS file: /cvs/unreal/Attic/Makefile.in,v
retrieving revision 1.1.2.23.2.12
diff -u -B -r1.1.2.23.2.12 Makefile.in
--- Makefile.in	15 Dec 2010 01:31:16 -0000	1.1.2.23.2.12
+++ Makefile.in	17 Dec 2010 16:37:17 -0000
@@ -138,7 +138,7 @@
 
 custommodule:
 	@if test -z "${MODULEFILE}"; then echo "Please set MODULEFILE when calling \`\`make custommodule''. For example, \`\`make custommodule MODULEFILE=callerid''." >&2; exit 1; fi
-	cd src; ${MAKE} ${MAKEARGS} MODULEFILE=${MODULEFILE} 'EXLIBS=${EXLIBS}' custommodule
+	+cd src; $(MAKE) $(MAKEARGS) MODULEFILE=${MODULEFILE} 'EXLIBS=${EXLIBS}' custommodule
 
 server:
 build:
@@ -147,9 +147,9 @@
 		echo "Doing so now."; \
 		sh Config; \
 	fi
-	@for i in $(SUBDIRS); do \
+	+@for i in $(SUBDIRS); do \
 		echo "Building $$i";\
-		( cd $$i; ${MAKE} ${MAKEARGS} build; ) \
+		( cd $$i; $(MAKE) $(MAKEARGS) build; ) \
 	done
 	@echo ' __________________________________________________ '
 	@echo '| Compile is now complete.                         |'
@@ -167,9 +167,9 @@
 
 clean:
 	$(RM) -f *~ \#* core *.orig include/*.orig
-	@for i in $(SUBDIRS); do \
+	+@for i in $(SUBDIRS); do \
 		echo "Cleaning $$i";\
-		( cd $$i; ${MAKE} ${MAKEARGS} clean; ) \
+		( cd $$i; $(MAKE) $(MAKEARGS) clean; ) \
 	done
 	-@if [ -f include/setup.h ] ; then \
 	  echo "To really restart installation, remove include/setup.h" ; \
@@ -199,9 +199,9 @@
 	echo "" >> include/stamp.h
 
 depend:
-	@for i in $(SUBDIRS); do \
+	+@for i in $(SUBDIRS); do \
 		echo "Making dependencies in $$i";\
-		( cd $$i; ${MAKE} ${MAKEARGS} depend; ) \
+		( cd $$i; $(MAKE) $(MAKEARGS) depend; ) \
 	done
 
 install: all
===================================================================
RCS file: /cvs/unreal/src/Makefile,v
retrieving revision 1.1.1.1.6.1.2.44.2.12
diff -u -B -r1.1.1.1.6.1.2.44.2.12 Makefile
--- src/Makefile	15 Dec 2010 18:45:30 -0000	1.1.1.1.6.1.2.44.2.12
+++ src/Makefile	17 Dec 2010 16:37:17 -0000
@@ -32,17 +32,6 @@
 
 SRC=$(OBJS:%.o=%.c)
 
-MAKEARGS =	'CFLAGS=${CFLAGS}' 'CC=${CC}' 'IRCDLIBS=${IRCDLIBS}' \
-		'LDFLAGS=${LDFLAGS}' 'IRCDMODE=${IRCDMODE}' \
-		'BINDIR=${BINDIR}' 'INSTALL=${INSTALL}' \
-		'INCLUDEDIR=${INCLUDEDIR}' 'IRCDDIR=${IRCDDIR}' \
-		'MANDIR=${MANDIR}' 'RM=${RM}' 'CP=${CP}' 'TOUCH=${TOUCH}' \
-		'RES=${RES}' 'SHELL=${SHELL}' 'STRTOUL=${STRTOUL}' \
-		'CRYPTOLIB=${CRYPTOLIB}' \
-		'CRYPTOINCLUDES=${CRYPTOINCLUDES}' 'URL=${URL}' \
-
-MY_MAKE = $(MAKE) $(MAKEARGS)
-
 INCLUDES = ../include/auth.h ../include/badwords.h ../include/channel.h \
 	../include/class.h ../include/common.h ../include/config.h ../include/dbuf.h \
 	../include/dynconf.h ../include/events.h ../include/fdlist.h ../include/h.h \
@@ -60,7 +49,7 @@
 build: ircd mods
 
 custommodule:
-	cd modules; $(MY_MAKE) MODULEFILE=$(MODULEFILE) 'EXLIBS=$(EXLIBS)' custommodule
+	+cd modules; $(MAKE) MODULEFILE=$(MODULEFILE) 'EXLIBS=$(EXLIBS)' custommodule
 
 ircd: $(OBJS)
 	$(CC) $(CFLAGS) $(CRYPTOLIB) -o ircd $(OBJS) $(LDFLAGS) $(IRCDLIBS) $(CRYPTOLIB)
@@ -83,7 +72,7 @@
 	@if [ ! -r modules ] ; then \
 		echo "You havent done cvs update -P -d"; \
 	fi
-	cd modules; $(MY_MAKE) all
+	+cd modules; $(MAKE) all
 
 version.c: version.c.SH ../Changes
 	$(SHELL) version.c.SH
===================================================================
RCS file: /cvs/unreal/src/s_bsd.c,v
retrieving revision 1.1.1.1.6.1.2.175.2.39
diff -u -B -r1.1.1.1.6.1.2.175.2.39 s_bsd.c