Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix the Makefile to work with the install instructions in the README #259

Merged
merged 4 commits into from
Mar 29, 2020
Merged

Fix the Makefile to work with the install instructions in the README #259

merged 4 commits into from
Mar 29, 2020

Conversation

LeLobster
Copy link
Contributor

@LeLobster LeLobster commented Sep 18, 2018

Before submitting a pull request, please make sure the following is done:

  • Fork the repository and create your branch from master.
  • If you've added code that should be tested, add tests!
  • Ensure the test suite passes.
  • Format your code with ShellCheck.
  • Include a human-readable description of what the pull request is trying to accomplish.
  • Steps for the reviewer(s) on how they can manually QA the changes.
  • Have a fixes #XX reference to the issue that this pull request fixes.

First time working with a Makefile but all I did was fix it so the instructions in the README actually work.
INSTALL_DIR, CONFIG_DIR & BASH_COMPLETION were not used in the original Makefile, instead there were bindir, sysconfdir & datarootdir.
Also removed all the references to DESTDIR because that was not used at all and did nothing.

The default install location is still the same as I've changed nothing besides naming.

@iamleot
Copy link

iamleot commented Sep 18, 2018 via email

@LeLobster
Copy link
Contributor Author

LeLobster commented Sep 18, 2018

I did not know that.
No problem, I'll move them back right away.

EDIT -> No idea why I named it DEST_DIR in the commit message but it's fine in the Makefile

@LeLobster
Copy link
Contributor Author

On second thought, after I did some reading about the Makefile standards on https://www.gnu.org/prep/standards/html_node/Makefile-Conventions.html which I probably should've done before submitting a PR, let's ignore this one and keep the original names.

How about just adding a check if those dirs are passed on the command line and assign them to bindir, sysconfdir & datarootdir if they are?

Makefile Show resolved Hide resolved
@karbassi
Copy link
Member

Thoughts @inkarkat?

It looks good to me at first glance.

Copy link
Member

@inkarkat inkarkat left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks fine to me.

@karbassi karbassi merged commit c6d290b into todotxt:master Mar 29, 2020
wwalker pushed a commit to wwalker/todo.txt-cli that referenced this pull request Sep 19, 2021
…odotxt#259)

* Fix the Makefile to work with the install instructions in the README

* Put back DEST_DIR

* Add simple ifdef checks to see if the user has set custom dirs via the commandline

* Update README to match Makefile
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants