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
164
165
166
167
168
169
170
171
172
|
diff -ru --no-dereference -x .git FreeDoko-orig/Makefile FreeDoko/Makefile
--- FreeDoko-orig/Makefile 2017-09-03 19:38:04.723372749 +0200
+++ FreeDoko/Makefile 2017-09-03 19:41:11.514300330 +0200
@@ -136,8 +136,7 @@
.PHONY: compile
compile:
# compile FreeDoko
- $(MAKE) Version
- $(MAKE) -C src/ $(PROGRAM)
+ $(MAKE) -C src release_bin
@echo "---"
@echo "* Program 'FreeDoko' created"
@@ -316,13 +315,11 @@
ifeq ($(OPERATING_SYSTEM), Linux)
.PHONY: install
install : check_install
- $(MAKE) -C src release_bin
# Copying the program
echo "Copying the program"
mkdir -p $(DESTDIR)$(BIN_DIRECTORY)
cp src/FreeDoko $(DESTDIR)$(BIN_DIRECTORY)
- -chgrp games $(DESTDIR)$(BIN_DIRECTORY)/FreeDoko
- chmod 750 $(DESTDIR)$(BIN_DIRECTORY)/FreeDoko
+ chmod 755 $(DESTDIR)$(BIN_DIRECTORY)/FreeDoko
cd $(DESTDIR)$(BIN_DIRECTORY) && ln -sf FreeDoko freedoko
# Copying the data files
echo "Copying the data files"
@@ -342,15 +339,13 @@
a2x -f manpage doc/freedoko.adoc
mkdir -p $(DESTDIR)$(MAN_DIRECTORY)
cp doc/freedoko.6 $(DESTDIR)$(MAN_DIRECTORY)/
- -chgrp games $(DESTDIR)$(MAN_DIRECTORY)/freedoko.6
- chmod 640 $(DESTDIR)$(MAN_DIRECTORY)/freedoko.6
+ chmod 644 $(DESTDIR)$(MAN_DIRECTORY)/freedoko.6
cd $(DESTDIR)$(MAN_DIRECTORY)/ && ln -sf freedoko.6 FreeDoko.6
# copy the icon
echo "copy the icon"
mkdir -p $(DESTDIR)$(ICON_DIRECTORY)
cp src/FreeDoko.png $(DESTDIR)$(ICON_DIRECTORY)/
- -chgrp games $(DESTDIR)$(ICON_DIRECTORY)/FreeDoko.png
- chmod 640 $(DESTDIR)$(ICON_DIRECTORY)/FreeDoko.png
+ chmod 644 $(DESTDIR)$(ICON_DIRECTORY)/FreeDoko.png
echo "Installation erfolgreich"
.PHONY: check_install
diff -ru --no-dereference -x .git FreeDoko-orig/Makefile.install.directories FreeDoko/Makefile.install.directories
--- FreeDoko-orig/Makefile.install.directories 2017-09-03 19:38:04.723372749 +0200
+++ FreeDoko/Makefile.install.directories 2017-09-03 19:38:36.096303160 +0200
@@ -4,14 +4,14 @@
# the different directories for the files
# installing in /usr/local
-MAIN_DIRECTORY = /usr/local
-BIN_DIRECTORY = $(MAIN_DIRECTORY)/games
-DATA_DIRECTORY = $(MAIN_DIRECTORY)/share/games/FreeDoko
-HELP_DIRECTORY = $(MAIN_DIRECTORY)/share/doc/FreeDoko
-MAN_DIRECTORY = $(MAIN_DIRECTORY)/share/man/man6
-ICON_DIRECTORY = $(MAIN_DIRECTORY)/share/pixmaps
-LOCALE_DIRECTORY = $(MAIN_DIRECTORY)/share/locale
-DESKTOP_FILE_DIRECTORY = $(MAIN_DIRECTORY)/share/applications
+#MAIN_DIRECTORY = /usr/local
+#BIN_DIRECTORY = $(MAIN_DIRECTORY)/games
+#DATA_DIRECTORY = $(MAIN_DIRECTORY)/share/games/FreeDoko
+#HELP_DIRECTORY = $(MAIN_DIRECTORY)/share/doc/FreeDoko
+#MAN_DIRECTORY = $(MAIN_DIRECTORY)/share/man/man6
+#ICON_DIRECTORY = $(MAIN_DIRECTORY)/share/pixmaps
+#LOCALE_DIRECTORY = $(MAIN_DIRECTORY)/share/locale
+#DESKTOP_FILE_DIRECTORY = $(MAIN_DIRECTORY)/share/applications
# debian
#MAIN_DIRECTORY = /usr
@@ -54,14 +54,14 @@
#DESKTOP_FILE_DIRECTORY = $(MAIN_DIRECTORY)/share/applications
# Arch Linux
-#MAIN_DIRECTORY = /usr
-#BIN_DIRECTORY = $(MAIN_DIRECTORY)/bin
-#DATA_DIRECTORY = $(MAIN_DIRECTORY)/share/freedoko
-#HELP_DIRECTORY = $(MAIN_DIRECTORY)/share/doc/freedoko
-#MAN_DIRECTORY = $(MAIN_DIRECTORY)/share/man/man6
-#ICON_DIRECTORY = $(MAIN_DIRECTORY)/share/pixmaps
-#LOCALE_DIRECTORY = $(MAIN_DIRECTORY)/share/locale
-#DESKTOP_FILE_DIRECTORY = $(MAIN_DIRECTORY)/share/applications
+MAIN_DIRECTORY = /usr
+BIN_DIRECTORY = $(MAIN_DIRECTORY)/bin
+DATA_DIRECTORY = $(MAIN_DIRECTORY)/share/freedoko
+HELP_DIRECTORY = $(MAIN_DIRECTORY)/share/doc/freedoko
+MAN_DIRECTORY = $(MAIN_DIRECTORY)/share/man/man6
+ICON_DIRECTORY = $(MAIN_DIRECTORY)/share/pixmaps
+LOCALE_DIRECTORY = $(MAIN_DIRECTORY)/share/locale
+DESKTOP_FILE_DIRECTORY = $(MAIN_DIRECTORY)/share/applications
# release
diff -ru --no-dereference -x .git FreeDoko-orig/bin/FreeDoko.desktop FreeDoko/bin/FreeDoko.desktop
--- FreeDoko-orig/bin/FreeDoko.desktop 2017-09-03 19:38:04.723372749 +0200
+++ FreeDoko/bin/FreeDoko.desktop 2017-09-03 19:38:46.752832849 +0200
@@ -6,7 +6,7 @@
Comment=game of Doppelkopf
Comment[de]=Doppelkopf-Spiel
Comment[fr]=un jeu de Doppelkopf
-Exec=/usr/games/freedoko
+Exec=/usr/bin/freedoko
Path=
Icon=FreeDoko
Categories=Application;Game;CardGame;
diff -ru --no-dereference -x .git FreeDoko-orig/data/Makefile FreeDoko/data/Makefile
--- FreeDoko-orig/data/Makefile 2017-09-03 19:38:05.403364021 +0200
+++ FreeDoko/data/Makefile 2017-09-03 19:39:02.862625671 +0200
@@ -32,8 +32,7 @@
for d in cardsets iconsets backgrounds sounds; do \
$(MAKE) -C $$d install; \
done
- -chgrp games $(DESTDIR)$(DATA_DIRECTORY) && chgrp -R games $(DESTDIR)$(DATA_DIRECTORY)
- chmod -R o-rwx,g+rX,g-w $(DESTDIR)$(DATA_DIRECTORY)
+ chmod -R o-rwx,g+rX,g-w,+rX $(DESTDIR)$(DATA_DIRECTORY)
endif
ifeq ($(SHELLTYPE), sh)
diff -ru --no-dereference -x .git FreeDoko-orig/doc/Makefile FreeDoko/doc/Makefile
--- FreeDoko-orig/doc/Makefile 2017-09-03 19:38:06.300019179 +0200
+++ FreeDoko/doc/Makefile 2017-09-03 19:39:20.952392881 +0200
@@ -34,8 +34,7 @@
fi
cp -a Bugs GPL Roadmap hpux.required_libs-ia64.txt $(DESTDIR)$(HELP_DIRECTORY)/
for d in de en; do $(MAKE) -C $$d install; done
- -chgrp games $(DESTDIR)$(HELP_DIRECTORY) && chgrp -R games $(DESTDIR)$(HELP_DIRECTORY)
- chmod -R o-rwx,g+rX,g-w $(DESTDIR)$(HELP_DIRECTORY)
+ chmod -R o-rwx,g+rX,g-w,+rX $(DESTDIR)$(HELP_DIRECTORY)
cd $(DESTDIR)$(DATA_DIRECTORY) && ln -sf $(HELP_DIRECTORY)/ doc
endif
diff -ru --no-dereference -x .git FreeDoko-orig/src/Makefile FreeDoko/src/Makefile
--- FreeDoko-orig/src/Makefile 2017-09-03 19:38:06.980010451 +0200
+++ FreeDoko/src/Makefile 2017-09-03 19:40:00.958544194 +0200
@@ -260,6 +260,7 @@
$(INCLUDE_ALL) \
$(LIBS_ALL) \
$(CXXFLAGS) \
+ $(LDFLAGS) \
-o $@
@echo "$(PROGRAM) compiled successfully"
@@ -279,7 +280,6 @@
-DMANUAL_DIRECTORY_VALUE='\"$(HELP_DIRECTORY)/manual\"' \
-DLOCALE_DIRECTORY='\"$(LOCALE_DIRECTORY)\"'" \
$(PROGRAM)
- $(MAKE) strip
# strip the program from all symbols
.PHONY: strip
diff -ru --no-dereference -x .git FreeDoko-orig/src/Makefile.local.template FreeDoko/src/Makefile.local.template
--- FreeDoko-orig/src/Makefile.local.template 2017-09-03 19:38:06.980010451 +0200
+++ FreeDoko/src/Makefile.local.template 2017-09-03 19:41:35.870852887 +0200
@@ -29,11 +29,11 @@
#CPPFLAGS += -DMANUAL_DIRECTORY_VALUE='"../manual"'
# a description for the version information
-ifeq ($(RELEASE), true)
-CPPFLAGS += -DVERSION_DESCRIPTION='"$(OPERATING_SYSTEM_NAME)"'
-else
-CPPFLAGS += -DVERSION_DESCRIPTION='"self compiled"'
-endif
+#ifeq ($(RELEASE), true)
+#CPPFLAGS += -DVERSION_DESCRIPTION='"$(OPERATING_SYSTEM_NAME)"'
+#else
+#CPPFLAGS += -DVERSION_DESCRIPTION='"self compiled"'
+#endif
# whether to create a segmentation fault (and hence a core dump) when FreeDoko
# has found an error
|