Move to /usr

packaging/debian/install

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

packaging/debian/rules

@@ -6,8 +6,4 @@
 
 override_dh_auto_install:
 
-	make install DESTDIR=debian/tmp
-
-override_dh_usrlocal:
-
-	@true
+	make install DESTDIR=debian/tmp PREFIX=/usr

packaging/template.spec

@@ -25,22 +25,22 @@ also re-use the source as template for your new toolkit.
 %setup -q
 
 %build
-make %{?_smp_mflags}
+make %{?_smp_mflags} PREFIX=/usr
 
 %install
-%make_install
+%make_install PREFIX=/usr
 
 %files
-%config %{_sysconfdir}/bash_completion.d/saturnin-demo.bash
-%dir /usr/local/libexec/saturnin-demo
-%dir /usr/local/share/saturnin-demo
-%dir /usr/local/share/saturnin-demo/ini.d
-%dir /usr/local/share/saturnin-demo/ini.d/main
-%doc /usr/local/share/doc/saturnin-demo/README.md
-/usr/local/bin/saturnin-demo
-/usr/local/libexec/saturnin-demo/saturnin-demo-dump
-/usr/local/libexec/saturnin-demo/saturnin-demo-echo
-/usr/local/share/saturnin-demo/ini.d/main/echo.ini
+%config %{_sysconfdir}/bash_completion.d/%{name}.bash
+%dir %{_libexecdir}/%{name}
+%dir %{_datadir}/%{name}
+%dir %{_datadir}/%{name}/ini.d
+%dir %{_datadir}/%{name}/ini.d/main
+%doc %{_docdir}/%{name}/README.md
+%{_bindir}/%{name}
+%{_libexecdir}/%{name}/%{name}-dump
+%{_libexecdir}/%{name}/%{name}-echo
+%{_datadir}/%{name}/ini.d/main/echo.ini
 
 
 %changelog