[Qemu-devel] [7177] buildsytem: consistently use install (Christoph Egger)

[Anthony Liguori]

Revision: 7177
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=7177
Author:   aliguori
Date:     2009-04-18 15:36:02 +0000 (Sat, 18 Apr 2009)
Log Message:
-----------
buildsytem: consistently use install (Christoph Egger)

attached patch makes qemu use install consistently.

Signed-off-by: Christoph Egger <address@hidden>
Signed-off-by: Anthony Liguori <address@hidden>

Modified Paths:
--------------
    trunk/Makefile
    trunk/configure

Modified: trunk/Makefile
===================================================================
--- trunk/Makefile      2009-04-18 07:32:41 UTC (rev 7176)
+++ trunk/Makefile      2009-04-18 15:36:02 UTC (rev 7177)
@@ -255,30 +255,30 @@
 endif
 
 install-doc: $(DOCS)
-       mkdir -p "$(DESTDIR)$(docdir)"
-       $(INSTALL) -m 644 qemu-doc.html  qemu-tech.html "$(DESTDIR)$(docdir)"
+       $(INSTALL_DIR) "$(DESTDIR)$(docdir)"
+       $(INSTALL_DATA) qemu-doc.html  qemu-tech.html "$(DESTDIR)$(docdir)"
 ifndef CONFIG_WIN32
-       mkdir -p "$(DESTDIR)$(mandir)/man1"
-       $(INSTALL) -m 644 qemu.1 qemu-img.1 "$(DESTDIR)$(mandir)/man1"
-       mkdir -p "$(DESTDIR)$(mandir)/man8"
-       $(INSTALL) -m 644 qemu-nbd.8 "$(DESTDIR)$(mandir)/man8"
+       $(INSTALL_DIR) "$(DESTDIR)$(mandir)/man1"
+       $(INSTALL_DATA) qemu.1 qemu-img.1 "$(DESTDIR)$(mandir)/man1"
+       $(INSTALL_DIR) "$(DESTDIR)$(mandir)/man8"
+       $(INSTALL_DATA) qemu-nbd.8 "$(DESTDIR)$(mandir)/man8"
 endif
 
 install: all $(if $(BUILD_DOCS),install-doc)
-       mkdir -p "$(DESTDIR)$(bindir)"
+       $(INSTALL_DIR) "$(DESTDIR)$(bindir)"
 ifneq ($(TOOLS),)
-       $(INSTALL) -m 755 $(STRIP_OPT) $(TOOLS) "$(DESTDIR)$(bindir)"
+       $(INSTALL_PROG) $(STRIP_OPT) $(TOOLS) "$(DESTDIR)$(bindir)"
 endif
 ifneq ($(BLOBS),)
-       mkdir -p "$(DESTDIR)$(datadir)"
+       $(INSTALL_DIR) "$(DESTDIR)$(datadir)"
        set -e; for x in $(BLOBS); do \
-               $(INSTALL) -m 644 $(SRC_PATH)/pc-bios/$$x 
"$(DESTDIR)$(datadir)"; \
+               $(INSTALL_DATA) $(SRC_PATH)/pc-bios/$$x "$(DESTDIR)$(datadir)"; 
\
        done
 endif
 ifndef CONFIG_WIN32
-       mkdir -p "$(DESTDIR)$(datadir)/keymaps"
+       $(INSTALL_DIR) "$(DESTDIR)$(datadir)/keymaps"
        set -e; for x in $(KEYMAPS); do \
-               $(INSTALL) -m 644 $(SRC_PATH)/keymaps/$$x 
"$(DESTDIR)$(datadir)/keymaps"; \
+               $(INSTALL_DATA) $(SRC_PATH)/keymaps/$$x 
"$(DESTDIR)$(datadir)/keymaps"; \
        done
 endif
        for d in $(TARGET_DIRS); do \

Modified: trunk/configure
===================================================================
--- trunk/configure     2009-04-18 07:32:41 UTC (rev 7176)
+++ trunk/configure     2009-04-18 15:36:02 UTC (rev 7177)
@@ -1339,6 +1339,9 @@
 echo "#define CONFIG_QEMU_SHAREDIR \"$prefix$datasuffix\"" >> $config_h
 echo "MAKE=$make" >> $config_mak
 echo "INSTALL=$install" >> $config_mak
+echo "INSTALL_DIR=$install -d -m0755 -p" >> $config_mak
+echo "INSTALL_DATA=$install -m0644 -p" >> $config_mak
+echo "INSTALL_PROG=$install -m0755 -p" >> $config_mak
 echo "CC=$cc" >> $config_mak
 echo "HOST_CC=$host_cc" >> $config_mak
 echo "AR=$ar" >> $config_mak