Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 33345 | Differences between
and this patch

Collapse All | Expand All

(-)Makefile.orig (-5 / +8 lines)
Lines 35-41 Link Here
35
35
36
INSTALL_PREFIX=
36
INSTALL_PREFIX=
37
37
38
MODCONF=$(shell if [ -d $(INSTALL_PREFIX)/etc/modprobe.d ]; then echo "$(INSTALL_PREFIX)/etc/modprobe.d/zaptel"; elif [ -d $(INSTALL_PREFIX)/etc/modutils ]; then echo "$(INSTALL_PREFIX)/etc/modutils/zaptel"; elif [ -f $(INSTALL_PREFIX)/etc/modprobe.conf ]; then echo "$(INSTALL_PREFIX)/modprobe.conf"; elif [ -f $(INSTALL_PREFIX)/etc/modules.conf ]; then echo "$(INSTALL_PREFIX)/etc/modules.conf"; else echo $(INSTALL_PREFIX)/etc/conf.modules ; fi)
38
#MODCONF=$(shell if [ -d $(INSTALL_PREFIX)/etc/modprobe.d ]; then echo "$(INSTALL_PREFIX)/etc/modprobe.d/zaptel"; elif [ -d $(INSTALL_PREFIX)/etc/modutils ]; then echo "$(INSTALL_PREFIX)/etc/modutils/zaptel"; elif [ -f $(INSTALL_PREFIX)/etc/modprobe.conf ]; then echo "$(INSTALL_PREFIX)/modprobe.conf"; elif [ -f $(INSTALL_PREFIX)/etc/modules.conf ]; then echo "$(INSTALL_PREFIX)/etc/modules.conf"; else echo $(INSTALL_PREFIX)/etc/conf.modules ; fi)
39
# Patch for Gentoo, uses modules.d
40
MODCONF=$(INSTALL_PREFIX)/etc/modules.d/zaptel
39
41
40
DEVFS=$(shell ps ax | grep -v grep | grep devfsd)
42
DEVFS=$(shell ps ax | grep -v grep | grep devfsd)
41
43
Lines 255-260 Link Here
255
	install -m 644 tonezone.h $(INSTALL_PREFIX)/usr/include
257
	install -m 644 tonezone.h $(INSTALL_PREFIX)/usr/include
256
	( cd $(INSTALL_PREFIX)/usr/lib ; rm -f libtonezone.so ; ln -sf $(LIBTONEZONE) libtonezone.so )
258
	( cd $(INSTALL_PREFIX)/usr/lib ; rm -f libtonezone.so ; ln -sf $(LIBTONEZONE) libtonezone.so )
257
	/sbin/ldconfig
259
	/sbin/ldconfig
260
	mkdir -p $(INSTALL_PREFIX)/etc/modules.d
258
	if [ -f $(MODCONF) ]; then mv -f $(MODCONF) $(MODCONF).bak ; fi
261
	if [ -f $(MODCONF) ]; then mv -f $(MODCONF) $(MODCONF).bak ; fi
259
	cat $(MODCONF).bak | grep -v "alias char-major-250" | \
262
	cat $(MODCONF).bak | grep -v "alias char-major-250" | \
260
	grep -v "post-install torisa /sbin/ztcfg" | \
263
	grep -v "post-install torisa /sbin/ztcfg" | \
Lines 279-288 Link Here
279
		fi; \
282
		fi; \
280
	done
283
	done
281
284
282
	if [ -d /etc/modutils ]; then \
285
	#if [ -d /etc/modutils ]; then \
283
		/sbin/update-modules ; \
286
	#	/sbin/update-modules ; \
284
	fi
287
	#fi
285
	-/sbin/depmod -a
288
	#-/sbin/depmod -a
286
	[ -f $(INSTALL_PREFIX)/etc/zaptel.conf ] || install -m 644 zaptel.conf.sample $(INSTALL_PREFIX)/etc/zaptel.conf
289
	[ -f $(INSTALL_PREFIX)/etc/zaptel.conf ] || install -m 644 zaptel.conf.sample $(INSTALL_PREFIX)/etc/zaptel.conf
287
290
288
config:
291
config:

Return to bug 33345