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
|
Description: Implement standard installation path modifiers.
The upstream source has a build system that polutes file paths
with quotation marks. This is inappropriate for UNIX systems,
and it interferes with the next alteration.
.
Introduce a standard prefix DESTDIR for installation paths.
Author: Mats Erik Andersson <mats.andersson@gisladisker.se>
Forwarded: yes
Last-Update: 2010-11-09
diff -Naur rgbpaint-0.8.7.orig/configure rgbpaint-0.8.7/configure
--- rgbpaint-0.8.7.orig/configure
+++ rgbpaint-0.8.7/configure
@@ -174,13 +174,13 @@
L_EX="$L_EX -lintl"
echo "MT_LANG_DEST=\"$BIN_INSTALL/$MT_LANG_DEST\"" >> $GTK_FILE
else
- echo "MT_LANG_DEST=\"$MT_LANG_DEST\"" >> $GTK_FILE
+ echo "MT_LANG_DEST=$MT_LANG_DEST" >> $GTK_FILE
fi
fi
if [ "$MT_MAN" == YES ]
then
MAKE_DIRS="$MAKE_DIRS doc"
- echo "MT_MAN_DEST=\"$MT_MAN_DEST\"" >> $GTK_FILE
+ echo "MT_MAN_DEST=$MT_MAN_DEST" >> $GTK_FILE
fi
I_EX="$I_EX -DVERSION=\"\\\"$MT_VERSION\"\\\""
@@ -200,7 +200,7 @@
fi
echo "subdirs = $MAKE_DIRS" >> $GTK_FILE
- echo "BIN_INSTALL=\"$BIN_INSTALL\"" >> $GTK_FILE
+ echo "BIN_INSTALL=$BIN_INSTALL" >> $GTK_FILE
if [ "$MT_POD" == "YES" ]
diff -Naur rgbpaint-0.8.7.orig/doc/Makefile rgbpaint-0.8.7/doc/Makefile
--- rgbpaint-0.8.7.orig/doc/Makefile
+++ rgbpaint-0.8.7/doc/Makefile
@@ -10,11 +10,11 @@
pod2man "--release=$(MT_VERSION)" "--date=$(MT_DATE)" "--center=Mark Tyler's Painting Program" rgbpaint.pod > _rgbpaint.1
install:
- mkdir -p $(MT_MAN_DEST)
- cp $(MAN_PAGE).gz $(MT_MAN_DEST)
+ mkdir -p $(DESTDIR)$(MT_MAN_DEST)
+ cp $(MAN_PAGE).gz $(DESTDIR)$(MT_MAN_DEST)
uninstall:
- rm $(MT_MAN_DEST)/$(MAN_PAGE).gz
+ rm $(DESTDIR)$(MT_MAN_DEST)/$(MAN_PAGE).gz
clean:
rm *.gz
diff -Naur rgbpaint-0.8.7.orig/po/Makefile rgbpaint-0.8.7/po/Makefile
--- rgbpaint-0.8.7.orig/po/Makefile
+++ rgbpaint-0.8.7/po/Makefile
@@ -6,11 +6,11 @@
for iii in $(langs); do echo -n "$$iii = "; msgfmt -v -o $$iii.mo $$iii.po; done
install:
- for iii in $(langs); do mkdir -p $(MT_LANG_DEST)/$$iii/LC_MESSAGES/; done
- for iii in $(langs); do cp $$iii.mo $(MT_LANG_DEST)/$$iii/LC_MESSAGES/rgbpaint.mo; done
+ for iii in $(langs); do mkdir -p $(DESTDIR)$(MT_LANG_DEST)/$$iii/LC_MESSAGES/; done
+ for iii in $(langs); do cp $$iii.mo $(DESTDIR)$(MT_LANG_DEST)/$$iii/LC_MESSAGES/rgbpaint.mo; done
uninstall:
- for iii in $(langs); do rm $(MT_LANG_DEST)/$$iii/LC_MESSAGES/rgbpaint.mo; done
+ for iii in $(langs); do rm $(DESTDIR)$(MT_LANG_DEST)/$$iii/LC_MESSAGES/rgbpaint.mo; done
clean:
rm *.mo
diff -Naur rgbpaint-0.8.7.orig/src/Makefile rgbpaint-0.8.7/src/Makefile
--- rgbpaint-0.8.7.orig/src/Makefile
+++ rgbpaint-0.8.7/src/Makefile
@@ -17,8 +17,8 @@
rm -f *.o $(BIN)*
install:
- mkdir -p $(BIN_INSTALL)
- cp $(BIN) $(BIN_INSTALL)
+ mkdir -p $(DESTDIR)$(BIN_INSTALL)
+ cp $(BIN) $(DESTDIR)$(BIN_INSTALL)
uninstall:
- rm $(BIN_INSTALL)/$(BIN)
+ rm $(DESTDIR)$(BIN_INSTALL)/$(BIN)
|
