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
|
diff -ru --no-dereference -x .git FreeDoko-orig/Makefile FreeDoko/Makefile
--- FreeDoko-orig/Makefile 2018-01-09 11:35:40.845184810 +0100
+++ FreeDoko/Makefile 2018-01-09 11:37:02.943311456 +0100
@@ -316,8 +316,7 @@
echo "Kopiere das Programm"
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 "Kopiere die Daten"
@@ -337,15 +336,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 "Kopiere das 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
# copy the desktop file
echo "Kopiere den Desktop-Starter"
mkdir -p "$(DESTDIR)$(DESKTOP_FILE_DIRECTORY)"
diff -ru --no-dereference -x .git FreeDoko-orig/Makefile.install.directories FreeDoko/Makefile.install.directories
--- FreeDoko-orig/Makefile.install.directories 2018-01-09 11:35:40.845184810 +0100
+++ FreeDoko/Makefile.install.directories 2018-01-09 11:37:27.016100663 +0100
@@ -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
# Void Linux
#MAIN_DIRECTORY = /usr
diff -ru --no-dereference -x .git FreeDoko-orig/data/Makefile FreeDoko/data/Makefile
--- FreeDoko-orig/data/Makefile 2018-01-09 11:35:41.508502890 +0100
+++ FreeDoko/data/Makefile 2018-01-09 11:35:59.458090895 +0100
@@ -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 2018-01-09 11:35:42.411815455 +0100
+++ FreeDoko/doc/Makefile 2018-01-09 11:36:17.161019281 +0100
@@ -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 2018-02-03 13:08:27.308068751 +0100
+++ FreeDoko/src/Makefile 2018-02-03 13:17:38.273976791 +0100
@@ -264,7 +264,6 @@
-DMANUAL_DIRECTORY_VALUE='\"$(HELP_DIRECTORY)/manual\"' \
-DLOCALE_DIRECTORY='\"$(LOCALE_DIRECTORY)\"'" \
$(PROGRAM)
- $(MAKE) strip
# strip the program from all symbols
.PHONY: strip
|