Revise paths in distributed conf files

Mr-Dave · Mr-Dave · commit 601deba25c4b · 2023-02-04T23:17:44.000-07:00
diff --git a/data/camera1-dist.conf.in b/data/camera1-dist.conf.in
@@ -1,4 +1,4 @@
-; @sysconfdir@/motionplus/camera1.conf
+; @prefix@/etc/motionplus/camera1.conf
 ;
 ; This config file was generated by @PACKAGE_NAME@ @PACKAGE_VERSION@
 
diff --git a/data/camera2-dist.conf.in b/data/camera2-dist.conf.in
@@ -1,4 +1,4 @@
-; @sysconfdir@/motionplus/camera2.conf
+; @prefix@/etc/motionplus/camera2.conf
 ;
 ; This config file was generated by @PACKAGE_NAME@ @PACKAGE_VERSION@
 
diff --git a/data/camera3-dist.conf.in b/data/camera3-dist.conf.in
@@ -1,4 +1,4 @@
-; @sysconfdir@/motionplus/camera3.conf
+; @prefix@/etc/motionplus/camera3.conf
 ;
 ; This config file was generated by @PACKAGE_NAME@ @PACKAGE_VERSION@
 
diff --git a/data/motionplus-dist.conf.in b/data/motionplus-dist.conf.in
@@ -97,12 +97,12 @@ stream_preview_method 0
 ;*************************************************
 ; Device config files - One for each device.
 ;*************************************************
-; camera @sysconfdir@/motionplus/camera1.conf
-; camera @sysconfdir@/motionplus/camera2.conf
-; camera @sysconfdir@/motionplus/camera3.conf
-; sound @sysconfdir@/motionplus/sound1.conf
+; camera @prefix@/etc/motionplus/camera1.conf
+; camera @prefix@/etc/motionplus/camera2.conf
+; camera @prefix@/etc/motionplus/camera3.conf
+; sound @prefix@/etc/motionplus/sound1.conf
 
 ;*************************************************
 ; Directory to read '.conf' files for devices.
 ;*************************************************
-; config_dir @sysconfdir@/motionplus/conf.d
+; config_dir @prefix@/etc/motionplus/conf.d
diff --git a/data/sound1-dist.conf.in b/data/sound1-dist.conf.in
@@ -1,4 +1,4 @@
-; @sysconfdir@/motionplus/sound1.conf
+; @prefix@/etc/motionplus/sound1.conf
 ;
 ; This config file was generated by @PACKAGE_NAME@ @PACKAGE_VERSION@
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-; @sysconfdir@/motionplus/camera1.conf`
	`1`	`+; @prefix@/etc/motionplus/camera1.conf`
`2`	`2`	`;`
`3`	`3`	`; This config file was generated by @PACKAGE_NAME@ @PACKAGE_VERSION@`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-; @sysconfdir@/motionplus/camera2.conf`
	`1`	`+; @prefix@/etc/motionplus/camera2.conf`
`2`	`2`	`;`
`3`	`3`	`; This config file was generated by @PACKAGE_NAME@ @PACKAGE_VERSION@`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-; @sysconfdir@/motionplus/camera3.conf`
	`1`	`+; @prefix@/etc/motionplus/camera3.conf`
`2`	`2`	`;`
`3`	`3`	`; This config file was generated by @PACKAGE_NAME@ @PACKAGE_VERSION@`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-; @sysconfdir@/motionplus/sound1.conf`
	`1`	`+; @prefix@/etc/motionplus/sound1.conf`
`2`	`2`	`;`
`3`	`3`	`; This config file was generated by @PACKAGE_NAME@ @PACKAGE_VERSION@`
`4`	`4`