diff -urN slmodem-2.9.6.orig/Makefile slmodem-2.9.6/Makefile --- slmodem-2.9.6.orig/Makefile 2004-02-02 09:43:43.000000000 -0700 +++ slmodem-2.9.6/Makefile 2004-03-20 15:54:41.000000000 -0700 @@ -24,13 +24,13 @@ $(MAKE) -C $@ all install: all install-drivers - $(INSTALL) -D -m 755 modem/slmodemd ${DESTDIR}/usr/sbin/slmodemd - $(RM) -rf ${DESTDIR}/var/lib/slmodem - $(INSTALL) -d -D -m 755 ${DESTDIR}/var/lib/slmodem + $(INSTALL) -D -m 755 modem/slmodemd ${D}/usr/sbin/slmodemd + $(RM) -rf ${D}/var/lib/slmodem + $(INSTALL) -d -D -m 755 ${D}/var/lib/slmodem uninstall: uninstall-drivers - $(RM) ${DESTDIR}/usr/sbin/slmodemd - $(RM) -rf ${DESTDIR}/var/lib/slmodem + $(RM) ${D}/usr/sbin/slmodemd + $(RM) -rf ${D}/var/lib/slmodem drivers: $(MAKE) -C drivers KERNEL_DIR=$(KERNEL_DIR) diff -urN slmodem-2.9.6.orig/drivers/Makefile slmodem-2.9.6/drivers/Makefile --- slmodem-2.9.6.orig/drivers/Makefile 2003-12-21 14:15:54.000000000 -0700 +++ slmodem-2.9.6/drivers/Makefile 2004-03-20 15:55:05.000000000 -0700 @@ -42,25 +42,25 @@ $(RM) kernel-ver $(obj-m) $(obj-m:.o=.ko) *st7554.o amrmo_init.o sysdep_amr.o *.mod.* .*.cmd *~ install-devices: - mkdir -p ${DESTDIR}/dev - $(foreach minor,0 1 2 3, \ - mknod -m 600 ${DESTDIR}/dev/slamr$(minor) c 212 $(minor) ; ) echo -n - $(foreach minor,0 1 2 3, \ - mknod -m 600 ${DESTDIR}/dev/slusb$(minor) c 213 $(minor) ; ) echo -n + #mkdir -p ${D}/dev + #$(foreach minor,0 1 2 3, \ + # mknod -m 600 ${D}/dev/slamr$(minor) c 212 $(minor) ; ) echo -n + #$(foreach minor,0 1 2 3, \ + # mknod -m 600 ${D}/dev/slusb$(minor) c 213 $(minor) ; ) echo -n remove-devices: $(foreach minor,0 1 2 3, \ - $(RM) ${DESTDIR}/dev/slamr$(minor) ; ) echo -n + $(RM) ${D}/dev/slamr$(minor) ; ) echo -n $(foreach minor,0 1 2 3, \ - $(RM) ${DESTDIR}/dev/slusb$(minor) ; ) echo -n + $(RM) ${D}/dev/slusb$(minor) ; ) echo -n else ifeq ($(findstring 2.4,$(KERNEL_VER)),2.4) slusb-objs:= old_st7554.o obj:=. -module-dir:=${DESTDIR}/lib/modules/$(KERNEL_VER)/misc +module-dir:=${D}/lib/modules/$(KERNEL_VER)/misc -CFLAGS:= -Wall -pipe -O3 -fomit-frame-pointer -D__KERNEL__ -DMODULE -DEXPORT_SYMTAB -DMODVERSIONS --include $(KERNEL_DIR)/include/linux/modversions.h -I$(KERNEL_DIR)/include +CFLAGS:= ${CFLAGS} -D__KERNEL__ -DMODULE -DEXPORT_SYMTAB -DMODVERSIONS --include $(KERNEL_DIR)/include/linux/modversions.h -I$(KERNEL_DIR)/include all: $(obj-m) @@ -69,13 +69,13 @@ slamr.o slusb.o: $(LD) -r -o $@ $^ -install: uninstall-old +install: install -D -m 644 slamr.o $(module-dir)/slamr.o install -D -m 644 slusb.o $(module-dir)/slusb.o - cp /etc/modules.conf /etc/modules.conf.slamr && \ - echo 'alias char-major-212 slamr' >> /etc/modules.conf && \ - echo 'alias char-major-213 slusb' >> /etc/modules.conf - /sbin/depmod -a +# cp /etc/modules.conf /etc/modules.conf.slamr && \ +# echo 'alias char-major-212 slamr' >> /etc/modules.conf && \ +# echo 'alias char-major-213 slusb' >> /etc/modules.conf +# /sbin/depmod -a uninstall: /sbin/modprobe -r slamr slusb cp /etc/modules.conf /etc/modules.conf.slamr && \ @@ -95,14 +95,14 @@ else -module-dir:=${DESTDIR}/lib/modules/$(KERNEL_VER)/extra +module-dir:=${D}/lib/modules/$(KERNEL_VER)/extra all: $(MAKE) modules -C $(KERNEL_DIR) SUBDIRS=$(shell pwd) install: install -D -m 644 slamr.ko $(module-dir)/slamr.ko install -D -m 644 slusb.ko $(module-dir)/slusb.ko - /sbin/depmod -a +# /sbin/depmod -a uninstall: modprobe -r slamr ; echo -n modprobe -r slusb ; echo -n diff -urN slmodem-2.9.6.orig/modem/Makefile slmodem-2.9.6/modem/Makefile --- slmodem-2.9.6.orig/modem/Makefile 2003-11-20 05:50:47.000000000 -0700 +++ slmodem-2.9.6/modem/Makefile 2004-03-20 15:50:23.000000000 -0700 @@ -13,10 +13,10 @@ # ########################################################################### -CC:= gcc +CC:= ${CC} RM:= rm -f -CFLAGS:= -Wall -g -O -I. -DCONFIG_DEBUG_MODEM +CFLAGS:= ${CFLAGS} -I. -DCONFIG_DEBUG_MODEM modem-objs:= \