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
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
|
- respect CFLAGS
- respect LDFLAGS
- dont strip
- dont compress manpages
--- multipath-tools-0.4.7/devmap_name/Makefile
+++ multipath-tools-0.4.7/devmap_name/Makefile
@@ -12,3 +12,3 @@
else
- LDFLAGS = -ldevmapper
+ LDFLAGS += -ldevmapper
endif
@@ -24,3 +24,2 @@
$(CC) $(OBJS) -o $(EXEC) $(LDFLAGS)
- $(GZIP) $(EXEC).8 > $(EXEC).8.gz
@@ -28,3 +27,2 @@
$(CC) -static -o $(EXEC) $(OBJS)
- $(GZIP) $(EXEC).8 > $(EXEC).8.gz
@@ -32,5 +30,5 @@
install -d $(DESTDIR)$(bindir)
- install -s -m 755 $(EXEC) $(DESTDIR)$(bindir)/
+ install -m 755 $(EXEC) $(DESTDIR)$(bindir)/
install -d $(DESTDIR)$(mandir)
- install -m 644 $(EXEC).8.gz $(DESTDIR)$(mandir)
+ install -m 644 $(EXEC).8 $(DESTDIR)$(mandir)
--- multipath-tools-0.4.7/kpartx/Makefile
+++ multipath-tools-0.4.7/kpartx/Makefile
@@ -15,3 +15,3 @@
else
- LDFLAGS = -ldevmapper
+ LDFLAGS += -ldevmapper
OBJS = bsd.o dos.o kpartx.o solaris.o unixware.o dasd.o \
@@ -29,3 +29,2 @@
$(CC) $(OBJS) -o $(EXEC) $(LDFLAGS)
- $(GZIP) $(EXEC).8 > $(EXEC).8.gz
@@ -33,3 +32,2 @@
$(CC) -static -o $(EXEC) $(CRT0) $(OBJS) $(KLIBC) $(LIBGCC)
- $(GZIP) $(EXEC).8 > $(EXEC).8.gz
@@ -40,5 +38,5 @@
install -d $(DESTDIR)$(bindir)
- install -s -m 755 $(EXEC) $(DESTDIR)$(bindir)
+ install -m 755 $(EXEC) $(DESTDIR)$(bindir)
install -d $(DESTDIR)$(mandir)
- install -m 644 $(EXEC).8.gz $(DESTDIR)$(mandir)
+ install -m 644 $(EXEC).8 $(DESTDIR)$(mandir)
--- multipath-tools-0.4.7/libmultipath/Makefile
+++ multipath-tools-0.4.7/libmultipath/Makefile
@@ -8,3 +8,3 @@
-CFLAGS = -I$(checkersdir)
+CFLAGS += -I$(checkersdir)
--- multipath-tools-0.4.7/Makefile.inc
+++ multipath-tools-0.4.7/Makefile.inc
@@ -35,4 +35,4 @@
-OPTFLAGS = -pipe -g -Wall -Wunused -Wstrict-prototypes
-CFLAGS = $(OPTFLAGS)
+OPTFLAGS = -Wall -Wunused -Wstrict-prototypes
+CFLAGS += $(OPTFLAGS)
--- multipath-tools-0.4.7/multipath/Makefile
+++ multipath-tools-0.4.7/multipath/Makefile
@@ -27,3 +27,2 @@
$(CC) $(OBJS) -o $(EXEC) $(LDFLAGS)
- $(GZIP) $(EXEC).8 > $(EXEC).8.gz
@@ -31,3 +30,2 @@
$(CC) -static -o $(EXEC) $(CRT0) $(OBJS) $(KLIBC) $(LIBGCC)
- $(GZIP) $(EXEC).8 > $(EXEC).8.gz
@@ -41,10 +39,10 @@
install -d $(DESTDIR)$(bindir)
- install -s -m 755 $(EXEC) $(DESTDIR)$(bindir)/
+ install -m 755 $(EXEC) $(DESTDIR)$(bindir)/
install -d $(DESTDIR)/etc/udev/rules.d
- install -m 644 multipath.rules $(DESTDIR)/etc/udev/rules.d/
+ install -m 644 multipath.rules $(DESTDIR)/etc/udev/rules.d/40-multipath.rules
install -d $(DESTDIR)$(mandir)
- install -m 644 $(EXEC).8.gz $(DESTDIR)$(mandir)
+ install -m 644 $(EXEC).8 $(DESTDIR)$(mandir)
uninstall:
- rm $(DESTDIR)/etc/udev/rules.d/multipath.rules
+ rm $(DESTDIR)/etc/udev/rules.d/40-multipath.rules
rm $(DESTDIR)$(bindir)/$(EXEC)
--- multipath-tools-0.4.7/multipathd/Makefile
+++ multipath-tools-0.4.7/multipathd/Makefile
@@ -9,3 +9,3 @@
CFLAGS += -DDAEMON -I$(multipathdir) -I$(checkersdir)
-LDFLAGS = -lpthread -ldevmapper -lsysfs -lreadline -lncurses
+LDFLAGS += -lpthread -ldevmapper -lsysfs -lreadline -lncurses
@@ -37,3 +37,2 @@
$(CC) $(OBJS) -o $(EXEC) $(LDFLAGS)
- $(GZIP) $(EXEC).8 > $(EXEC).8.gz
@@ -47,6 +46,6 @@
install -d $(DESTDIR)$(bindir)
- install -s -m 755 $(EXEC) $(DESTDIR)$(bindir)
+ install -m 755 $(EXEC) $(DESTDIR)$(bindir)
install -d $(DESTDIR)$(rcdir)
install -d $(DESTDIR)$(mandir)
- install -m 644 $(EXEC).8.gz $(DESTDIR)$(mandir)
+ install -m 644 $(EXEC).8 $(DESTDIR)$(mandir)
--- multipath-tools-0.4.7/path_priority/pp_alua/Makefile
+++ multipath-tools-0.4.7/path_priority/pp_alua/Makefile
@@ -37,5 +37,5 @@
-install: $(BUILD) $(EXEC).8.gz
- $(INSTALL) -s -m 755 $(EXEC) $(DESTDIR)$(bindir)/$(EXEC)
- $(INSTALL) -m 644 $(EXEC).8.gz $(DESTDIR)$(mandir)/$(EXEC).8.gz
+install: $(BUILD) $(EXEC).8
+ $(INSTALL) -m 755 $(EXEC) $(DESTDIR)$(bindir)/$(EXEC)
+ $(INSTALL) -m 644 $(EXEC).8 $(DESTDIR)$(mandir)/$(EXEC).8
--- multipath-tools-0.4.7/path_priority/pp_balance_units/Makefile
+++ multipath-tools-0.4.7/path_priority/pp_balance_units/Makefile
@@ -15,3 +15,3 @@
CFLAGS += -I$(multipathdir) -DDEBUG=$(DEBUG)
- LDFLAGS = -ldevmapper
+ LDFLAGS += -ldevmapper
OBJS = pp_balance_units.o $(MULTIPATHLIB)-$(BUILD).a
@@ -37,3 +37,3 @@
install -d $(DESTDIR)$(bindir)
- install -s -m 755 $(EXEC) $(DESTDIR)$(bindir)/
+ install -m 755 $(EXEC) $(DESTDIR)$(bindir)/
--- multipath-tools-0.4.7/path_priority/pp_emc/Makefile
+++ multipath-tools-0.4.7/path_priority/pp_emc/Makefile
@@ -16,3 +16,3 @@
install: $(EXEC)
- install -s -m 755 $(EXEC) $(DESTDIR)$(bindir)/$(EXEC)
+ install -m 755 $(EXEC) $(DESTDIR)$(bindir)/$(EXEC)
--- multipath-tools-0.4.7/path_priority/pp_netapp/Makefile
+++ multipath-tools-0.4.7/path_priority/pp_netapp/Makefile
@@ -16,3 +16,3 @@
install: $(EXEC)
- install -s -m 755 $(EXEC) $(DESTDIR)$(bindir)/$(EXEC)
+ install -m 755 $(EXEC) $(DESTDIR)$(bindir)/$(EXEC)
--- multipath-tools-0.4.7/path_priority/pp_random/Makefile
+++ multipath-tools-0.4.7/path_priority/pp_random/Makefile
@@ -16,3 +16,3 @@
install: $(EXEC)
- install -s -m 755 $(EXEC) $(DESTDIR)$(bindir)/$(EXEC)
+ install -m 755 $(EXEC) $(DESTDIR)$(bindir)/$(EXEC)
--- multipath-tools-0.4.7/path_priority/pp_tpc/Makefile
+++ multipath-tools-0.4.7/path_priority/pp_tpc/Makefile
@@ -16,3 +16,3 @@
install: $(EXEC)
- install -s -m 755 $(EXEC) $(DESTDIR)$(bindir)/$(EXEC)
+ install -m 755 $(EXEC) $(DESTDIR)$(bindir)/$(EXEC)
|