Skip to content

Conversation

@yurrriq
Copy link
Contributor

@yurrriq yurrriq commented Apr 24, 2016

Similar to #223, update README.md to point to the new doc/src directory.

@rvirding
Copy link
Member

rvirding commented Apr 24, 2016

Could you also add to this patch a change in updating_docs.md so it also references doc/src/*.md? Having lots of tiny PRs makes the branches look so messy. :-) And rebase it?

@yurrriq
Copy link
Contributor Author

yurrriq commented Apr 24, 2016

Certainly. I just noticed a bunch of little things. 😄

@rvirding
Copy link
Member

Yes, I long ago tried once to rebase after I had pulled which did work but then suddenly most of the PRs weren't pulled any more. I think it was because I made new commits when I changed the branch which unpulled the original ones. Or something like that. I have not found a clean way of both pulling and rebasing.

@yurrriq
Copy link
Contributor Author

yurrriq commented Apr 24, 2016

I think GitHub offers some help there now, but I'm skeptical. https://github.com/blog/2141-squash-your-commits

@yurrriq
Copy link
Contributor Author

yurrriq commented Apr 24, 2016

I'm going to fold #230 in this one.

@yurrriq yurrriq closed this Apr 24, 2016
@yurrriq yurrriq reopened this Apr 24, 2016
@rvirding
Copy link
Member

That looks interesting. I must try that. The worst thing that can happen is that I have to reset and lose all the pulls and your branches magically reappear. I have always had this option but it has been hidden in a menu.

yurrriq and others added 2 commits April 24, 2016 13:08
Similar to #223, update README.md and doc/src/updating_docs.md
to point to the new doc/src directory.
Allow DESTBINDIR to be set by the user.

I use Nix to manage Erlang installations, which results in my not being
able to use the default DESTBINDIR.

With this change, the following works for me in fish shell:

    env DESTBINDIR=/usr/local/bin make install

This shouldn't have any negative consequences for "normal" users and
might be helpful to others as well.
@yurrriq
Copy link
Contributor Author

yurrriq commented Apr 24, 2016

Ok, sorry for the noise. This is good to go now :)

@rvirding
Copy link
Member

No worries, just me being picky. I will now try a squash and see what happens, cross your fingers.

@yurrriq
Copy link
Contributor Author

yurrriq commented Apr 24, 2016

Actually, hang on. I'll fold the Travis updates into this. Can you set up the https://travis-ci.org end, @rvirding? You basically just have to authenticate and flip the switch.

@rvirding
Copy link
Member

Wait

@yurrriq
Copy link
Contributor Author

yurrriq commented Apr 24, 2016

I'm on Slack if you want to discuss in real time.

@rvirding
Copy link
Member

The squash apparently compacts all the commits into one commit, not just ff merging it into the branch. Let's try a small experiment as it is now first.

@rvirding rvirding merged commit ab095b8 into lfe:develop Apr 24, 2016
@yurrriq yurrriq deleted the patch-4 branch April 24, 2016 18:39
oubiwann pushed a commit that referenced this pull request Jul 26, 2020
* Update README.md and doc/src/updating_docs.md

Similar to #223, update README.md and doc/src/updating_docs.md
to point to the new doc/src directory.

* Update Makefile

Allow DESTBINDIR to be set by the user.

I use Nix to manage Erlang installations, which results in my not being
able to use the default DESTBINDIR.

With this change, the following works for me in fish shell:

    env DESTBINDIR=/usr/local/bin make install

This shouldn't have any negative consequences for "normal" users and
might be helpful to others as well.
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.

2 participants