From b9ba7aeb165cffecdffb60aec8c3fa8d590d9ca9 Mon Sep 17 00:00:00 2001
From: Ralf Baechle <ralf@linux-mips.org>
Date: Fri, 28 Apr 2000 01:09:25 +0000
Subject: Merge with 2.3.99-pre6.

---
 Makefile | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 966cf5696..46f8aff04 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 VERSION = 2
 PATCHLEVEL = 3
 SUBLEVEL = 99
-EXTRAVERSION = -pre5
+EXTRAVERSION = -pre6
 
 KERNELRELEASE=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
 
@@ -29,7 +29,6 @@ NM		= $(CROSS_COMPILE)nm
 STRIP		= $(CROSS_COMPILE)strip
 OBJCOPY		= $(CROSS_COMPILE)objcopy
 OBJDUMP		= $(CROSS_COMPILE)objdump
-MAKE		= make
 MAKEFILES	= $(TOPDIR)/.config
 GENKSYMS	= /sbin/genksyms
 MODFLAGS	= -DMODULE
@@ -338,6 +337,10 @@ modules_install:
 	if [ -f PCMCIA_SCSI_MODULES ]; then inst_mod PCMCIA_SCSI_MODULES pcmcia; fi; \
 	\
 	ls -1 -U *.o | sort > $$MODLIB/.allmods; \
+	if [ -f $$MODLIB/net/3c59x.o ]; then \
+		mkdir -p $$MODLIB/pcmcia; \
+		ln -nfs ../net/3c59x.o $$MODLIB/pcmcia/3c575_cb.o; \
+		MODULES="$$MODULES 3c575_cb.o"; fi; \
 	echo $$MODULES | tr ' ' '\n' | sort | comm -23 $$MODLIB/.allmods - > $$MODLIB/.misc; \
 	if [ -s $$MODLIB/.misc ]; then inst_mod $$MODLIB/.misc misc; fi; \
 	rm -f $$MODLIB/.misc $$MODLIB/.allmods; \
@@ -366,6 +369,7 @@ clean:	archclean
 	rm -f drivers/char/conmakehash
 	rm -f drivers/pci/devlist.h drivers/pci/classlist.h drivers/pci/gen-devlist
 	rm -f drivers/sound/bin2hex drivers/sound/hex2hex
+	rm -f drivers/atm/fore200e_mkfirm drivers/atm/{pca,sba}*{.bin,.bin1,.bin2}
 	rm -f net/khttpd/make_times_h
 	rm -f net/khttpd/times.h
 	rm -f submenu*
@@ -384,6 +388,7 @@ mrproper: clean archmrproper
 	rm -f drivers/sound/msndperm.c
 	rm -f drivers/sound/pndsperm.c
 	rm -f drivers/sound/pndspini.c
+	rm -f drivers/atm/fore200e_*_fw.c drivers/atm/.fore200e_*.fw
 	rm -f .version .config* config.in config.old
 	rm -f scripts/tkparse scripts/kconfig.tk scripts/kconfig.tmp
 	rm -f scripts/lxdialog/*.o scripts/lxdialog/lxdialog
@@ -407,14 +412,15 @@ backup: mrproper
 	sync
 
 sgmldocs: 
+	chmod 755 $(TOPDIR)/scripts/docgen
+	chmod 755 $(TOPDIR)/scripts/gen-all-syms
+	chmod 755 $(TOPDIR)/scripts/kernel-doc
 	$(MAKE) -C $(TOPDIR)/Documentation/DocBook books
 
 psdocs: sgmldocs
-	$(MAKE) -C scripts docproc
 	$(MAKE) -C Documentation/DocBook ps
 
 pdfdocs: sgmldocs
-	$(MAKE) -C scripts docproc
 	$(MAKE) -C Documentation/DocBook pdf
  
 sums:
-- 
cgit v1.2.3