Patchwork Fix install(1) usage to be compatible with OpenBSD's install(1).

login
register
mail settings
Submitter Brad
Date Aug. 28, 2011, 8:01 a.m.
Message ID <20110828080128.GA12509@rox.home.comstyle.com>
Download mbox | patch
Permalink /patch/111899/
State New
Headers show

Comments

Brad - Aug. 28, 2011, 8:01 a.m.
Fix install(1) usage to be compatible with OpenBSD's install(1).

When creating a directory via the -d flag the -p flag cannot be
used at the same time. Also in the context of installing QEMU it
doesn't make sense to use the -p flag anyway so use the [default]
-c flag instead.

Signed-off-by: Brad Smith <brad@comstyle.com>

---
 configure |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
Anthony Liguori - Sept. 2, 2011, 3:38 p.m.
On 08/28/2011 03:01 AM, Brad wrote:
> Fix install(1) usage to be compatible with OpenBSD's install(1).
>
> When creating a directory via the -d flag the -p flag cannot be
> used at the same time. Also in the context of installing QEMU it
> doesn't make sense to use the -p flag anyway so use the [default]
> -c flag instead.
>
> Signed-off-by: Brad Smith<brad@comstyle.com>

Applied.  Thanks.

Regards,

Anthony Liguori

>
> ---
>   configure |    6 +++---
>   1 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/configure b/configure
> index 1340c33..ad60ea0 100755
> --- a/configure
> +++ b/configure
> @@ -3081,9 +3081,9 @@ echo "TOOLS=$tools">>  $config_host_mak
>   echo "ROMS=$roms">>  $config_host_mak
>   echo "MAKE=$make">>  $config_host_mak
>   echo "INSTALL=$install">>  $config_host_mak
> -echo "INSTALL_DIR=$install -d -m0755 -p">>  $config_host_mak
> -echo "INSTALL_DATA=$install -m0644 -p">>  $config_host_mak
> -echo "INSTALL_PROG=$install -m0755 -p">>  $config_host_mak
> +echo "INSTALL_DIR=$install -d -m 0755">>  $config_host_mak
> +echo "INSTALL_DATA=$install -c -m 0644">>  $config_host_mak
> +echo "INSTALL_PROG=$install -c -m 0755">>  $config_host_mak
>   echo "PYTHON=$python">>  $config_host_mak
>   echo "CC=$cc">>  $config_host_mak
>   echo "CC_I386=$cc_i386">>  $config_host_mak

Patch

diff --git a/configure b/configure
index 1340c33..ad60ea0 100755
--- a/configure
+++ b/configure
@@ -3081,9 +3081,9 @@  echo "TOOLS=$tools" >> $config_host_mak
 echo "ROMS=$roms" >> $config_host_mak
 echo "MAKE=$make" >> $config_host_mak
 echo "INSTALL=$install" >> $config_host_mak
-echo "INSTALL_DIR=$install -d -m0755 -p" >> $config_host_mak
-echo "INSTALL_DATA=$install -m0644 -p" >> $config_host_mak
-echo "INSTALL_PROG=$install -m0755 -p" >> $config_host_mak
+echo "INSTALL_DIR=$install -d -m 0755" >> $config_host_mak
+echo "INSTALL_DATA=$install -c -m 0644" >> $config_host_mak
+echo "INSTALL_PROG=$install -c -m 0755" >> $config_host_mak
 echo "PYTHON=$python" >> $config_host_mak
 echo "CC=$cc" >> $config_host_mak
 echo "CC_I386=$cc_i386" >> $config_host_mak