Patchwork install: honor DESTDIR on sysconfdir population

login
register
mail settings
Submitter Andre Przywara
Date March 8, 2010, 2:43 p.m.
Message ID <1268059421-32759-1-git-send-email-andre.przywara@amd.com>
Download mbox | patch
Permalink /patch/47118/
State New
Headers show

Comments

Andre Przywara - March 8, 2010, 2:43 p.m.
When creating and populating $sysconfdir, we should prepend $DESTDIR
as we do with all other paths.

Reported-by: Frank Arnold <frank.arnold@amd.com>
Signed-off-by: Andre Przywara <andre.przywara@amd.com>
---
 Makefile |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
Aurelien Jarno - March 13, 2010, 11:09 a.m.
On Mon, Mar 08, 2010 at 03:43:41PM +0100, Andre Przywara wrote:
> When creating and populating $sysconfdir, we should prepend $DESTDIR
> as we do with all other paths.
> 
> Reported-by: Frank Arnold <frank.arnold@amd.com>
> Signed-off-by: Andre Przywara <andre.przywara@amd.com>

Thanks, applied.

> ---
>  Makefile |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/Makefile b/Makefile
> index bf2cef2..2066c12 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -194,8 +194,8 @@ ifdef CONFIG_POSIX
>  endif
>  
>  install-sysconfig:
> -	$(INSTALL_DIR) "$(sysconfdir)/qemu"
> -	$(INSTALL_DATA) $(SRC_PATH)/sysconfigs/target/target-x86_64.conf "$(sysconfdir)/qemu"
> +	$(INSTALL_DIR) "$(DESTDIR)$(sysconfdir)/qemu"
> +	$(INSTALL_DATA) $(SRC_PATH)/sysconfigs/target/target-x86_64.conf "$(DESTDIR)$(sysconfdir)/qemu"
>  
>  install: all $(if $(BUILD_DOCS),install-doc) install-sysconfig
>  	$(INSTALL_DIR) "$(DESTDIR)$(bindir)"
> -- 
> 1.6.4
> 
> 
> 
> 
>

Patch

diff --git a/Makefile b/Makefile
index bf2cef2..2066c12 100644
--- a/Makefile
+++ b/Makefile
@@ -194,8 +194,8 @@  ifdef CONFIG_POSIX
 endif
 
 install-sysconfig:
-	$(INSTALL_DIR) "$(sysconfdir)/qemu"
-	$(INSTALL_DATA) $(SRC_PATH)/sysconfigs/target/target-x86_64.conf "$(sysconfdir)/qemu"
+	$(INSTALL_DIR) "$(DESTDIR)$(sysconfdir)/qemu"
+	$(INSTALL_DATA) $(SRC_PATH)/sysconfigs/target/target-x86_64.conf "$(DESTDIR)$(sysconfdir)/qemu"
 
 install: all $(if $(BUILD_DOCS),install-doc) install-sysconfig
 	$(INSTALL_DIR) "$(DESTDIR)$(bindir)"