Add support for DESTDIR variable #14
Merged
Conversation
This file contains 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
This allows (among others) packagers to install the files in a temporary folder to generate a RPM or DEB file. The DESTDIR variable is a well established convention for this. This commit also adds the possibility to override the installation PREFIX, BIN_DIR and DATA_DIR (as some distros would prefer /usr/games for the binary and /usr/share/games/tbftss for the data).
|
I had to revert this, as when I ran make install on my system, it broke (directories were incorrectly created, and the copy failed). I then had to manually delete the erroneous structure. This line: install -d $(INST_ICON_DIR)/{16x16,32x32,64x64,128x128}/apps literally created a directory called: {16x16,32x32,64x64,128x128} Other parts of the installation also failed, as my system (Mint) does not appear to make much use of /usr/local |
|
That's weird... What shell does not support the
What other parts of the installation failed? |
|
Or maybe |
|
I tested again locally, with Mageia 6 using BASH as shell interpreter, and it works just fine, after the install I get, using those instructions: If the only problematic line is Or even a |
|
And here's what I get as the output of my RPM, using those build instructions: And the package works fine. |
|
Okay, cool. It might be worth me having this as a separate makefile, as the layout is quite different from my Mint install; the locations go against what is configured for me system - I have nothing in /usr/games or /usr/local/share. If you were to call it makefile.packaging (or something like that) that would be the best bet. I can easily maintain them both. |
|
Well you can also set the default values that you like best. All values are defined with The current default values are and it would behave just like it used to. Also I'd split the problematic So basically it would all behave like it used to, but would be more flexible so that packagers can do what they need without having to patch the makefile. |
|
Could you try this branch and see if it behaves properly for you? https://github.com/akien-mga/tbftss/tree/pr-packaging |
stephenjsweeney
added a commit
that referenced
this pull request
Apr 26, 2016
…gurable install paths: #14
|
Excellent. Just save it a go and it all works fine. Thanks for the updating it. |
|
(this has been committed to the develop branch, not master right now) |
|
Awesome, thanks :) |
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.
This allows (among others) packagers to install the files in a temporary
folder to generate a RPM or DEB file. The
DESTDIRvariable is a wellestablished convention for this.
This commit also adds the possibility to override the installation
PREFIX,BIN_DIRandDATA_DIR(as some distros would prefer/usr/gamesfor the binaryand
/usr/share/games/tbftssfor the data).This commit also makes the default
DATA_DIR/usr/local/share/tbftss, if you prefer to keep/opt/tbftssfor this purpose I could change it back.