Browse Source

Move to /usr

Alois Mahdal 7 years ago
parent
commit
f5ebcc2ab0
3 changed files with 18 additions and 22 deletions
  1. 5
    5
      packaging/debian/install
  2. 1
    5
      packaging/debian/rules
  3. 12
    12
      packaging/template.spec

+ 5
- 5
packaging/debian/install View File

1
 /etc/bash_completion.d/saturnin-demo.bash
1
 /etc/bash_completion.d/saturnin-demo.bash
2
-/usr/local/bin/saturnin-demo
3
-/usr/local/libexec/saturnin-demo/saturnin-demo-dump
4
-/usr/local/libexec/saturnin-demo/saturnin-demo-echo
5
-/usr/local/share/doc/saturnin-demo/README.md
6
-/usr/local/share/saturnin-demo/ini.d/main/echo.ini
2
+/usr/bin/saturnin-demo
3
+/usr/libexec/saturnin-demo/saturnin-demo-dump
4
+/usr/libexec/saturnin-demo/saturnin-demo-echo
5
+/usr/share/doc/saturnin-demo/README.md
6
+/usr/share/saturnin-demo/ini.d/main/echo.ini

+ 1
- 5
packaging/debian/rules View File

6
 
6
 
7
 override_dh_auto_install:
7
 override_dh_auto_install:
8
 
8
 
9
-	make install DESTDIR=debian/tmp
10
-
11
-override_dh_usrlocal:
12
-
13
-	@true
9
+	make install DESTDIR=debian/tmp PREFIX=/usr

+ 12
- 12
packaging/template.spec View File

25
 %setup -q
25
 %setup -q
26
 
26
 
27
 %build
27
 %build
28
-make %{?_smp_mflags}
28
+make %{?_smp_mflags} PREFIX=/usr
29
 
29
 
30
 %install
30
 %install
31
-%make_install
31
+%make_install PREFIX=/usr
32
 
32
 
33
 %files
33
 %files
34
-%config %{_sysconfdir}/bash_completion.d/saturnin-demo.bash
35
-%dir /usr/local/libexec/saturnin-demo
36
-%dir /usr/local/share/saturnin-demo
37
-%dir /usr/local/share/saturnin-demo/ini.d
38
-%dir /usr/local/share/saturnin-demo/ini.d/main
39
-%doc /usr/local/share/doc/saturnin-demo/README.md
40
-/usr/local/bin/saturnin-demo
41
-/usr/local/libexec/saturnin-demo/saturnin-demo-dump
42
-/usr/local/libexec/saturnin-demo/saturnin-demo-echo
43
-/usr/local/share/saturnin-demo/ini.d/main/echo.ini
34
+%config %{_sysconfdir}/bash_completion.d/%{name}.bash
35
+%dir %{_libexecdir}/%{name}
36
+%dir %{_datadir}/%{name}
37
+%dir %{_datadir}/%{name}/ini.d
38
+%dir %{_datadir}/%{name}/ini.d/main
39
+%doc %{_docdir}/%{name}/README.md
40
+%{_bindir}/%{name}
41
+%{_libexecdir}/%{name}/%{name}-dump
42
+%{_libexecdir}/%{name}/%{name}-echo
43
+%{_datadir}/%{name}/ini.d/main/echo.ini
44
 
44
 
45
 
45
 
46
 %changelog
46
 %changelog