summarylogtreecommitdiffstats
path: root/makefile.diff
blob: 75a6d65481a3cf0597f3c6d8f58edc3a2cb67f11 (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
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
--- Makefile	2016-02-05 21:39:51.293133952 +0100
+++ Makefile.new	2016-02-05 21:41:24.989214136 +0100
@@ -19,12 +19,12 @@
 QMAKE         = /usr/lib/qt/bin/qmake
 DEL_FILE      = rm -f
 CHK_DIR_EXISTS= test -d
-MKDIR         = mkdir -p
+MKDIR         = install -d
 COPY          = cp -f
 COPY_FILE     = cp -f
 COPY_DIR      = cp -f -R
-INSTALL_FILE  = install -m 644 -p
-INSTALL_PROGRAM = install -m 755 -p
+INSTALL_FILE  = install -m 644
+INSTALL_PROGRAM = install -m 755
 INSTALL_DIR   = cp -f -R
 DEL_FILE      = rm -f
 SYMLINK       = ln -f -s
@@ -726,7 +726,7 @@
 	(cd `dirname $(DISTDIR)` && $(TAR) $(DISTNAME).tar $(DISTNAME) && $(COMPRESS) $(DISTNAME).tar) && $(MOVE) `dirname $(DISTDIR)`/$(DISTNAME).tar.gz . && $(DEL_FILE) -r $(DISTDIR)
 
 distdir: FORCE
-	@test -d $(DISTDIR) || mkdir -p $(DISTDIR)
+	@test -d $(DISTDIR) || install -d $(DISTDIR)
 	$(COPY_FILE) --parents $(DIST) $(DISTDIR)/
 	$(COPY_FILE) --parents translations/cs/qtikz_cs.ts translations/de/qtikz_de.ts translations/es/qtikz_es.ts translations/fr/qtikz_fr.ts $(DISTDIR)/
 	$(COPY_FILE) --parents doc/qtikz.qhcp $(DISTDIR)/
@@ -1496,7 +1496,7 @@
 ####### Install
 
 install_target: first FORCE
-	@test -d $(INSTALL_ROOT)/usr/bin || mkdir -p $(INSTALL_ROOT)/usr/bin
+	@test -d $(INSTALL_ROOT)/usr/bin || install -d $(INSTALL_ROOT)/usr/bin
 	-$(INSTALL_PROGRAM) $(QMAKE_TARGET) $(INSTALL_ROOT)/usr/bin/$(QMAKE_TARGET)
 	-$(STRIP) $(INSTALL_ROOT)/usr/bin/$(QMAKE_TARGET)
 
@@ -1506,7 +1506,7 @@
 
 
 install_translations: first FORCE
-	@test -d $(INSTALL_ROOT)/usr/share/qtikz/locale || mkdir -p $(INSTALL_ROOT)/usr/share/qtikz/locale
+	@test -d $(INSTALL_ROOT)/usr/share/qtikz/locale || install -d $(INSTALL_ROOT)/usr/share/qtikz/locale
 	-$(INSTALL_FILE) /home/haawda/paketierung/meine_Pakete/qtikz-git/src/qtikz/locale/qtikz_cs.qm $(INSTALL_ROOT)/usr/share/qtikz/locale/
 	-$(INSTALL_FILE) /home/haawda/paketierung/meine_Pakete/qtikz-git/src/qtikz/locale/qtikz_de.qm $(INSTALL_ROOT)/usr/share/qtikz/locale/
 	-$(INSTALL_FILE) /home/haawda/paketierung/meine_Pakete/qtikz-git/src/qtikz/locale/qtikz_es.qm $(INSTALL_ROOT)/usr/share/qtikz/locale/
@@ -1521,7 +1521,7 @@
 
 
 install_documentation: first FORCE
-	@test -d $(INSTALL_ROOT)/doc || mkdir -p $(INSTALL_ROOT)/doc
+	@test -d $(INSTALL_ROOT)/doc || install -d $(INSTALL_ROOT)/doc
 	-$(INSTALL_FILE) /home/haawda/paketierung/meine_Pakete/qtikz-git/src/qtikz/doc/qtikz.qch $(INSTALL_ROOT)/doc/
 	-$(INSTALL_FILE) /home/haawda/paketierung/meine_Pakete/qtikz-git/src/qtikz/doc/qtikz.qhc $(INSTALL_ROOT)/doc/
 
@@ -1532,7 +1532,7 @@
 
 
 install_man: first FORCE
-	@test -d $(INSTALL_ROOT)/usr/share/man/man1 || mkdir -p $(INSTALL_ROOT)/usr/share/man/man1
+	@test -d $(INSTALL_ROOT)/usr/share/man/man1 || install -d $(INSTALL_ROOT)/usr/share/man/man1
 	-$(INSTALL_FILE) /home/haawda/paketierung/meine_Pakete/qtikz-git/src/qtikz/qtikz.1 $(INSTALL_ROOT)/usr/share/man/man1/
 
 uninstall_man: FORCE
@@ -1541,7 +1541,7 @@
 
 
 install_desktop: first FORCE
-	@test -d $(INSTALL_ROOT)/usr/share/applications || mkdir -p $(INSTALL_ROOT)/usr/share/applications
+	@test -d $(INSTALL_ROOT)/usr/share/applications || install -d $(INSTALL_ROOT)/usr/share/applications
 	-$(INSTALL_FILE) /home/haawda/paketierung/meine_Pakete/qtikz-git/src/qtikz/qtikz.desktop $(INSTALL_ROOT)/usr/share/applications/
 
 uninstall_desktop: FORCE
@@ -1550,7 +1550,7 @@
 
 
 install_templates: first FORCE
-	@test -d $(INSTALL_ROOT)/usr/share/qtikz/templates || mkdir -p $(INSTALL_ROOT)/usr/share/qtikz/templates
+	@test -d $(INSTALL_ROOT)/usr/share/qtikz/templates || install -d $(INSTALL_ROOT)/usr/share/qtikz/templates
 	-$(INSTALL_FILE) /home/haawda/paketierung/meine_Pakete/qtikz-git/src/qtikz/data/examples/template_example.pgs $(INSTALL_ROOT)/usr/share/qtikz/templates/
 	-$(INSTALL_FILE) /home/haawda/paketierung/meine_Pakete/qtikz-git/src/qtikz/data/examples/template_example2.pgs $(INSTALL_ROOT)/usr/share/qtikz/templates/
 	-$(INSTALL_FILE) /home/haawda/paketierung/meine_Pakete/qtikz-git/src/qtikz/data/examples/beamer-example-template.pgs $(INSTALL_ROOT)/usr/share/qtikz/templates/
@@ -1563,7 +1563,7 @@
 
 
 install_resources: first FORCE
-	@test -d $(INSTALL_ROOT)/usr/share/qtikz || mkdir -p $(INSTALL_ROOT)/usr/share/qtikz
+	@test -d $(INSTALL_ROOT)/usr/share/qtikz || install -d $(INSTALL_ROOT)/usr/share/qtikz
 	-$(INSTALL_FILE) /home/haawda/paketierung/meine_Pakete/qtikz-git/src/qtikz/app/icons/qtikz-128.png $(INSTALL_ROOT)/usr/share/qtikz/
 
 uninstall_resources: FORCE
@@ -1572,7 +1572,7 @@
 
 
 install_mimetype: first FORCE
-	@test -d $(INSTALL_ROOT)/usr/share/mime/packages || mkdir -p $(INSTALL_ROOT)/usr/share/mime/packages
+	@test -d $(INSTALL_ROOT)/usr/share/mime/packages || install -d $(INSTALL_ROOT)/usr/share/mime/packages
 	-$(INSTALL_FILE) /home/haawda/paketierung/meine_Pakete/qtikz-git/src/qtikz/data/qtikz.xml $(INSTALL_ROOT)/usr/share/mime/packages/
 
 uninstall_mimetype: FORCE
@@ -1581,7 +1581,7 @@
 
 
 install_license: first FORCE
-	@test -d $(INSTALL_ROOT)/usr/share/qtikz || mkdir -p $(INSTALL_ROOT)/usr/share/qtikz
+	@test -d $(INSTALL_ROOT)/usr/share/qtikz || install -d $(INSTALL_ROOT)/usr/share/qtikz
 	-$(INSTALL_FILE) /home/haawda/paketierung/meine_Pakete/qtikz-git/src/qtikz/LICENSE.GPL2 $(INSTALL_ROOT)/usr/share/qtikz/
 
 uninstall_license: FORCE