pci-database: Makefile - unbreak pcimap rule

glen glen at pld-linux.org
Thu Dec 21 21:53:54 CET 2006


Author: glen                         Date: Thu Dec 21 20:53:54 2006 GMT
Module: pci-database                  Tag: HEAD
---- Log message:
- unbreak pcimap rule

---- Files affected:
pci-database:
   Makefile (1.22 -> 1.23) 

---- Diffs:

================================================================
Index: pci-database/Makefile
diff -u pci-database/Makefile:1.22 pci-database/Makefile:1.23
--- pci-database/Makefile:1.22	Thu Dec 21 18:25:43 2006
+++ pci-database/Makefile	Thu Dec 21 21:53:49 2006
@@ -31,21 +31,24 @@
 $(DATABASES): pci.ids
 	if test "$@" != "snd.pci" ; then ./addname $@.in | sort > $@; else ./addname $@.in > $@; fi
 
-pcimap: pcimap-snd pcimap-scsi pcimap-net
+pcimap: pcimap-snd pcimap-scsi pcimap-net pcimap-net
 
 pcimap-snd: FORCE
 	s=snd.pci.in; grep '^snd-' $(KERNELSRCDIR)/modules.pcimap | \
-	./pcimap | sort -u > $$s.tmp && mv $$s.tmp $$s
+	./pcimap > tmp; sort -u $$s tmp > $$s.tmp && mv $$s.tmp $$s; \
+	rm -f tmp
 
 pcimap-scsi:
 	s=scsi.pci.in; find $(KERNELSRCDIR)/kernel/drivers/scsi | awk -F/ '{a = $$NF; sub("\.ko\.gz$$", "", a); printf("^%s \n", a)}' | \
 	grep -f - $(KERNELSRCDIR)/modules.pcimap | \
-	./pcimap | sort -u > $$s.tmp && mv $$s.tmp $$s
+	./pcimap > tmp; sort -u $$s tmp > $$s.tmp && mv $$s.tmp $$s; \
+	rm -f tmp
 
 pcimap-net:
 	s=net.pci.in; find $(KERNELSRCDIR)/kernel/drivers/net | awk -F/ '{a = $$NF; sub("\.ko\.gz$$", "", a); printf("^%s \n", a)}' | \
 	grep -f - $(KERNELSRCDIR)/modules.pcimap | \
-	./pcimap | sort -u > $$s.tmp && mv $$s.tmp $$s
+	./pcimap > tmp; sort -u $$s tmp > $$s.tmp && mv $$s.tmp $$s; \
+	rm -f tmp
 
 FORCE:
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/pci-database/Makefile?r1=1.22&r2=1.23&f=u



More information about the pld-cvs-commit mailing list