Create ZM_PATH_DATA and point zmupdate to ZM_PATH_DATA/db#200
Merged
mastertheknife merged 3 commits intoZoneMinder:masterfrom Oct 6, 2013
Merged
Create ZM_PATH_DATA and point zmupdate to ZM_PATH_DATA/db#200mastertheknife merged 3 commits intoZoneMinder:masterfrom
mastertheknife merged 3 commits intoZoneMinder:masterfrom
Conversation
Added support for @PKGDATADIR@ in CMakeLists.txt
Contributor
|
This is a good pull request, it has clear and good description. |
mastertheknife
added a commit
that referenced
this pull request
Oct 6, 2013
Create ZM_PATH_DATA and point zmupdate to ZM_PATH_DATA/db
Member
Author
|
Thanks @mastertheknife However, I do want to make sure @connortechnology sees this since he has been working in the same file. |
Merged
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Problem:
Previously, zmupdate.pl looked for the update sql scripts under ZM_PATH_BUILD/db. ZM_PATH_BUILD points to the folder the source files were built from. However, this folder does not exist on systems on which zoneminder was not built from source (e.g. deb, rpm, pkg, etc).
Solution:
Create a new ZM variable called ZM_PATH_DATA, which points to @PKGDATADIR@. Then modify zmupdate to look in ZM_PATH_DATA/db.
Couple of things to note:
Awaiting feedback.