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

Remove duplicated ${DESTDIR}. #290

Merged
merged 1 commit into from
Jul 29, 2014
Merged

Remove duplicated ${DESTDIR}. #290

merged 1 commit into from
Jul 29, 2014

Conversation

omasanori
Copy link
Contributor

Both Makefile.in and install.sh prepended ${DESTDIR} to ${PREFIX} so the installation prefix became ${DESTDIR}/${DESTDIR}/${PREFIX}. Also, the script assumes that ${DESTDIR} ends with a slash or ${PREFIX} starts with it so I appended a slash to ${DESTDIR}.

Both Makefile.in and install.sh prepended ${DESTDIR} to ${PREFIX} so the
installation prefix became ${DESTDIR}/${DESTDIR}/${PREFIX}.

Signed-off-by: OGINO Masanori <masanori.ogino@gmail.com>
bors added a commit that referenced this pull request Jul 29, 2014
Both Makefile.in and install.sh prepended `${DESTDIR}` to `${PREFIX}` so the installation prefix became `${DESTDIR}/${DESTDIR}/${PREFIX}`. Also, the script assumes that `${DESTDIR}` ends with a slash or `${PREFIX}` starts with it so I appended a slash to `${DESTDIR}`.
@bors bors merged commit 59689f0 into rust-lang:master Jul 29, 2014
@omasanori omasanori deleted the makefile branch July 29, 2014 22:12
bors added a commit to alexcrichton/cargo that referenced this pull request Sep 2, 2014
Both Makefile.in and install.sh prepended `${DESTDIR}` to `${PREFIX}` so the installation prefix became `${DESTDIR}/${DESTDIR}/${PREFIX}`. Also, the script assumes that `${DESTDIR}` ends with a slash or `${PREFIX}` starts with it so I appended a slash to `${DESTDIR}`.
vivo75 pushed a commit to vivo75/vivovl that referenced this pull request Sep 6, 2017
Note that it will still fail to install cargo until
rust-lang/cargo#290 is merged.

Signed-off-by: OGINO Masanori <masanori.ogino@gmail.com>
bors added a commit that referenced this pull request Mar 18, 2019
Update toml requirement from 0.4.2 to 0.5.0

Updates the requirements on [toml](https://github.com/alexcrichton/toml-rs) to permit the latest version.
<details>
<summary>Release notes</summary>

*Sourced from [toml's releases](https://github.com/alexcrichton/toml-rs/releases).*

> ## Preserve order feature, minor fixes
> - Add `preserve_order` Cargo feature. This retains the order of map keys in `toml::Value`. ([#278](https://github-redirect.dependabot.com/alexcrichton/toml-rs/issues/278))
> - Fix issue [#279](https://github-redirect.dependabot.com/alexcrichton/toml-rs/issues/279) where some duplicate table headers were accepted. Added `Deserializer::set_allow_duplicate_after_longer_table` for anyone who wants to retain the old, broken behavior. ([#280](https://github-redirect.dependabot.com/alexcrichton/toml-rs/issues/280))
> - Fix case sensitivity with T, Z, and E. ([#290](https://github-redirect.dependabot.com/alexcrichton/toml-rs/issues/290))
> - Add `PartialEq` to `de::Error`. ([#292](https://github-redirect.dependabot.com/alexcrichton/toml-rs/issues/292))
</details>
<details>
<summary>Commits</summary>

- [`dbdcc9c`](toml-rs/toml-rs@dbdcc9c) Merge pull request [#292](https://github-redirect.dependabot.com/alexcrichton/toml-rs/issues/292) from omarabid/master
- [`fbc0557`](toml-rs/toml-rs@fbc0557) Add PartialEq to Toml::de
- [`4fb12b4`](toml-rs/toml-rs@4fb12b4) Merge pull request [#290](https://github-redirect.dependabot.com/alexcrichton/toml-rs/issues/290) from ehuss/fix-case-sensitivity
- [`8fce90e`](toml-rs/toml-rs@8fce90e) Fix case sensitivity with T, Z, and E.
- [`56f9afb`](toml-rs/toml-rs@56f9afb) Merge pull request [#278](https://github-redirect.dependabot.com/alexcrichton/toml-rs/issues/278) from Kerollmops/master
- [`d0977ab`](toml-rs/toml-rs@d0977ab) Merge pull request [#280](https://github-redirect.dependabot.com/alexcrichton/toml-rs/issues/280) from alexcrichton/fix-duplicate
- [`7ee1c1b`](toml-rs/toml-rs@7ee1c1b) Fix disallowing duplicate table headers
- [`ad5ea1d`](toml-rs/toml-rs@ad5ea1d) Update build urls
- [`600c6e5`](toml-rs/toml-rs@600c6e5) Tweak travis config
- [`0372ba6`](toml-rs/toml-rs@0372ba6) Update the serde test-suite map! macro
- Additional commits viewable in [compare view](toml-rs/toml-rs@0.4.2...0.5.0)
</details>
<br />

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot ignore this [patch|minor|major] version` will close this PR and stop Dependabot creating any more for this minor/major version (unless you reopen the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
- `@dependabot use these labels` will set the current labels as the default for future PRs for this repo and language
- `@dependabot use these reviewers` will set the current reviewers as the default for future PRs for this repo and language
- `@dependabot use these assignees` will set the current assignees as the default for future PRs for this repo and language
- `@dependabot use this milestone` will set the current milestone as the default for future PRs for this repo and language
- `@dependabot badge me` will comment on this PR with code to add a "Dependabot enabled" badge to your readme

Additionally, you can set the following in your Dependabot [dashboard](https://app.dependabot.com):
- Update frequency (including time of day and day of week)
- Automerge options (never/patch/minor, and dev/runtime dependencies)
- Pull request limits (per update run and/or open at any time)
- Out-of-range updates (receive only lockfile updates, if desired)
- Security updates (receive only security updates, if desired)

Finally, you can contact us by mentioning @dependabot.

</details>
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