wok diff 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 diff
     1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/get-softmodem-driver/stuff/hsfmodem-7.80.02.03full-makefile.diff	Mon Jun 15 09:08:48 2009 +0200
     1.3 @@ -0,0 +1,39 @@
     1.4 +--- hsfmodem-7.80.02.03full/config.mak	Fri Feb 20 22:30:12 2009
     1.5 ++++ hsfmodem-7.80.02.03full-slitaz/config.mak	Sat May  9 22:38:51 2009
     1.6 +@@ -55,7 +55,7 @@
     1.7 + # maximum number of modem units
     1.8 + CNXTMAXMDM=8
     1.9 + 
    1.10 +-ROOT=
    1.11 ++ROOT=$(DESTDIR)
    1.12 + PREFIX=$(ROOT)/usr
    1.13 + 
    1.14 + ETCDIR=$(ROOT)/etc
    1.15 +@@ -131,4 +131,4 @@
    1.16 + 		-e "s!@SCR_SUPPORT@!`test ! \"$(IMPORTED_SCR_SUPPORT)\" = yes; echo $$?`!g" \
    1.17 + 		-e "s!@DMP_SUPPORT@!`test -z \"$(IMPORTED_DMP_SUPPORT)\"; echo $$?`!g" \
    1.18 + 		< $< > $@
    1.19 +-	chmod --reference=$< $@
    1.20 ++	chmod 755 $@
    1.21 +--- hsfmodem-7.80.02.03full/makefile	Mon Feb 23 22:51:37 2009
    1.22 ++++ hsfmodem-7.80.02.03full-slitaz/makefile	Sat May  9 22:38:51 2009
    1.23 +@@ -149,7 +149,7 @@
    1.24 + ifeq ($(RPMOPTEVAL),yes)
    1.25 + RPMTARGETCPU=$(shell rpm --eval '%_target_cpu')
    1.26 + else
    1.27 +-RPMTARGETCPU=$(shell uname -i)
    1.28 ++RPMTARGETCPU=$(shell uname -m)
    1.29 + endif
    1.30 + 
    1.31 + ifneq ($(RPMOPTDEFINE),yes)
    1.32 +--- hsfmodem-7.80.02.03full/modules/Makefile	Fri Feb 20 22:30:12 2009
    1.33 ++++ hsfmodem-7.80.02.03full-slitaz/modules/Makefile	Sat May  9 22:38:51 2009
    1.34 +@@ -20,7 +20,7 @@
    1.35 + include $(TOP)/config.mak
    1.36 + 
    1.37 + IMPORTED = $(TOP)/modules/imported
    1.38 +-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)
    1.39 ++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)
    1.40 + ifneq ($(subst powerpc,ppc,$(IMPORTED_ARCH)),$(MACHINE_ARCH))
    1.41 + $(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... ***)
    1.42 + endif