wok view 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 |
line source
1 --- hsfmodem-7.80.02.03full/config.mak Fri Feb 20 22:30:12 2009
2 +++ hsfmodem-7.80.02.03full-slitaz/config.mak Sat May 9 22:38:51 2009
3 @@ -55,7 +55,7 @@
4 # maximum number of modem units
5 CNXTMAXMDM=8
7 -ROOT=
8 +ROOT=$(DESTDIR)
9 PREFIX=$(ROOT)/usr
11 ETCDIR=$(ROOT)/etc
12 @@ -131,4 +131,4 @@
13 -e "s!@SCR_SUPPORT@!`test ! \"$(IMPORTED_SCR_SUPPORT)\" = yes; echo $$?`!g" \
14 -e "s!@DMP_SUPPORT@!`test -z \"$(IMPORTED_DMP_SUPPORT)\"; echo $$?`!g" \
15 < $< > $@
16 - chmod --reference=$< $@
17 + chmod 755 $@
18 --- hsfmodem-7.80.02.03full/makefile Mon Feb 23 22:51:37 2009
19 +++ hsfmodem-7.80.02.03full-slitaz/makefile Sat May 9 22:38:51 2009
20 @@ -149,7 +149,7 @@
21 ifeq ($(RPMOPTEVAL),yes)
22 RPMTARGETCPU=$(shell rpm --eval '%_target_cpu')
23 else
24 -RPMTARGETCPU=$(shell uname -i)
25 +RPMTARGETCPU=$(shell uname -m)
26 endif
28 ifneq ($(RPMOPTDEFINE),yes)
29 --- hsfmodem-7.80.02.03full/modules/Makefile Fri Feb 20 22:30:12 2009
30 +++ hsfmodem-7.80.02.03full-slitaz/modules/Makefile Sat May 9 22:38:51 2009
31 @@ -20,7 +20,7 @@
32 include $(TOP)/config.mak
34 IMPORTED = $(TOP)/modules/imported
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)
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)
37 ifneq ($(subst powerpc,ppc,$(IMPORTED_ARCH)),$(MACHINE_ARCH))
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... ***)
39 endif