wok annotate get-softmodem-driver/stuff/hsfmodem-7.80.02.03full-makefile.diff @ rev 3452
get-softmodem-driver: fix to hsf auto config
| author | Dominique Corbex <domcox@users.sourceforge.net> |
|---|---|
| date | Mon Jun 15 09:08:48 2009 +0200 (2009-06-15) |
| parents | |
| children |
| rev | line source |
|---|---|
| domcox@3452 | 1 --- hsfmodem-7.80.02.03full/config.mak Fri Feb 20 22:30:12 2009 |
| domcox@3452 | 2 +++ hsfmodem-7.80.02.03full-slitaz/config.mak Sat May 9 22:38:51 2009 |
| domcox@3452 | 3 @@ -55,7 +55,7 @@ |
| domcox@3452 | 4 # maximum number of modem units |
| domcox@3452 | 5 CNXTMAXMDM=8 |
| domcox@3452 | 6 |
| domcox@3452 | 7 -ROOT= |
| domcox@3452 | 8 +ROOT=$(DESTDIR) |
| domcox@3452 | 9 PREFIX=$(ROOT)/usr |
| domcox@3452 | 10 |
| domcox@3452 | 11 ETCDIR=$(ROOT)/etc |
| domcox@3452 | 12 @@ -131,4 +131,4 @@ |
| domcox@3452 | 13 -e "s!@SCR_SUPPORT@!`test ! \"$(IMPORTED_SCR_SUPPORT)\" = yes; echo $$?`!g" \ |
| domcox@3452 | 14 -e "s!@DMP_SUPPORT@!`test -z \"$(IMPORTED_DMP_SUPPORT)\"; echo $$?`!g" \ |
| domcox@3452 | 15 < $< > $@ |
| domcox@3452 | 16 - chmod --reference=$< $@ |
| domcox@3452 | 17 + chmod 755 $@ |
| domcox@3452 | 18 --- hsfmodem-7.80.02.03full/makefile Mon Feb 23 22:51:37 2009 |
| domcox@3452 | 19 +++ hsfmodem-7.80.02.03full-slitaz/makefile Sat May 9 22:38:51 2009 |
| domcox@3452 | 20 @@ -149,7 +149,7 @@ |
| domcox@3452 | 21 ifeq ($(RPMOPTEVAL),yes) |
| domcox@3452 | 22 RPMTARGETCPU=$(shell rpm --eval '%_target_cpu') |
| domcox@3452 | 23 else |
| domcox@3452 | 24 -RPMTARGETCPU=$(shell uname -i) |
| domcox@3452 | 25 +RPMTARGETCPU=$(shell uname -m) |
| domcox@3452 | 26 endif |
| domcox@3452 | 27 |
| domcox@3452 | 28 ifneq ($(RPMOPTDEFINE),yes) |
| domcox@3452 | 29 --- hsfmodem-7.80.02.03full/modules/Makefile Fri Feb 20 22:30:12 2009 |
| domcox@3452 | 30 +++ hsfmodem-7.80.02.03full-slitaz/modules/Makefile Sat May 9 22:38:51 2009 |
| domcox@3452 | 31 @@ -20,7 +20,7 @@ |
| domcox@3452 | 32 include $(TOP)/config.mak |
| domcox@3452 | 33 |
| domcox@3452 | 34 IMPORTED = $(TOP)/modules/imported |
| domcox@3452 | 35 -MACHINE_ARCH := $(shell if uname --hardware-platform >/dev/null 2>&1 && ! uname --hardware-platform | grep -q "unknown"; then uname --hardware-platform; else uname --machine | sed 's/^i.86$$/i386/'; fi) |
| domcox@3452 | 36 +MACHINE_ARCH := $(shell if uname -p >/dev/null 2>&1 && ! uname -p | grep -q "unknown"; then uname -p; else uname -m | sed 's/^i.86$$/i386/'; fi) |
| domcox@3452 | 37 ifneq ($(subst powerpc,ppc,$(IMPORTED_ARCH)),$(MACHINE_ARCH)) |
| domcox@3452 | 38 $(warning *** WARNING: Trying to compile kernel modules on a $(MACHINE_ARCH) system while the installed $(CNXTTARGET) driver package is for $(IMPORTED_ARCH), this is likely to fail... ***) |
| domcox@3452 | 39 endif |