blob: 660d2394e7f076a435de97a105ace7e21e3a3aca (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
|
diff -uNr zaptel-1.2.23/build_tools/genmodconf zaptel-1.2.23.gentoo/build_tools/genmodconf
--- zaptel-1.2.23/build_tools/genmodconf 2007-07-11 14:58:09.000000000 -0400
+++ zaptel-1.2.23.gentoo/build_tools/genmodconf 2008-01-27 12:15:34.000000000 -0500
@@ -79,20 +79,6 @@
echo Building ${target}...
-if [ "${1}" = "linux24" ]; then
- for mod in ${3}; do
- if ! grep -q "post-install ${mod} " ${target}; then
- echo "post-install ${mod} /sbin/ztcfg" >> ${target}
- fi
- done
-elif [ "${1}" = "linux26" ]; then
- for mod in ${3}; do
- if ! grep -q "install ${mod} " ${target}; then
- echo "install ${mod} /sbin/modprobe --ignore-install ${mod} ${cmdopts} && /sbin/ztcfg" >> ${target}
- fi
- done
-fi
-
if [ -z "${combined}" ]; then
echo "***"
echo "*** WARNING:"
diff -uNr zaptel-1.2.23/Makefile zaptel-1.2.23.gentoo/Makefile
--- zaptel-1.2.23/Makefile 2007-12-11 03:50:21.000000000 -0500
+++ zaptel-1.2.23.gentoo/Makefile 2008-01-27 13:43:26.000000000 -0500
@@ -108,7 +108,7 @@
INSTALL_PREFIX := /usr
-CFLAGS+=-I. -O4 -g -fPIC -Wall
+CFLAGS+=-I. -g -Wall
ifneq (,$(findstring ppc,$(MACHINE)))
CFLAGS += -fsigned-char
KFLAGS += -msoft-float -fsigned-char
@@ -289,7 +289,7 @@
$(CC) $(KFLAGS) -o $@ -c $<
zonedata.lo tonezone.lo: %.lo: %.c
- $(CC) -c $(CFLAGS) -o $@ $^
+ $(CC) -c $(CFLAGS) -fPIC -o $@ $^
tones.h: gendigits
./gendigits > $@
@@ -394,7 +394,7 @@
else # DYNFS
ifdef UDEVRULES
install -d $(DESTDIR)/etc/udev/rules.d
- build_tools/genudevrules > $(DESTDIR)/etc/udev/rules.d/zaptel.rules
+ build_tools/genudevrules > $(DESTDIR)/etc/udev/rules.d/10-zaptel.rules
else # !UDEVRULES
@echo "**** Dynamic filesystem detected -- not creating device nodes"
endif
@@ -464,11 +464,10 @@
rm -f $(DESTDIR)$(MODS_DIR)/wcfxsusb.o
endif
rm -f $(DESTDIR)$(MODS_DIR)/wcfxs.o
- [ `id -u` = 0 ] && /sbin/depmod -a $(KVERS) || :
install-libs: libs
install -D -m 755 $(LIBTONEZONE_SO) $(DESTDIR)$(LIBDIR)/$(LIBTONEZONE_SO).$(LIBTONEZONE_SO_MAJOR_VER).$(LIBTONEZONE_SO_MINOR_VER)
- [ `id -u` = 0 ] && /sbin/ldconfig || :
+ [ `id -u` = 0 ] && /sbin/ldconfig -n $(DESTDIR)$(LIBDIR) || :
rm -f $(DESTDIR)$(LIBDIR)/$(LIBTONEZONE_SO)
ln -sf $(LIBTONEZONE_SO).$(LIBTONEZONE_SO_MAJOR_VER).$(LIBTONEZONE_SO_MINOR_VER) \
$(DESTDIR)$(LIBDIR)/$(LIBTONEZONE_SO).$(LIBTONEZONE_SO_MAJOR_VER)
|
GitWeb
