Commit 58f8aead106a5c8a4b5fa54c0be7cb6d19dbfbbc
1 parent
aeed97c4
buildsytem: consistently use install (Christoph Egger)
attached patch makes qemu use install consistently. Signed-off-by: Christoph Egger <Christoph.Egger@amd.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com> git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@7177 c046a42c-6fe2-441c-8c8c-71466251a162
Showing
2 changed files
with
15 additions
and
12 deletions
Makefile
| @@ -255,30 +255,30 @@ BLOBS= | @@ -255,30 +255,30 @@ BLOBS= | ||
| 255 | endif | 255 | endif |
| 256 | 256 | ||
| 257 | install-doc: $(DOCS) | 257 | install-doc: $(DOCS) |
| 258 | - mkdir -p "$(DESTDIR)$(docdir)" | ||
| 259 | - $(INSTALL) -m 644 qemu-doc.html qemu-tech.html "$(DESTDIR)$(docdir)" | 258 | + $(INSTALL_DIR) "$(DESTDIR)$(docdir)" |
| 259 | + $(INSTALL_DATA) qemu-doc.html qemu-tech.html "$(DESTDIR)$(docdir)" | ||
| 260 | ifndef CONFIG_WIN32 | 260 | ifndef CONFIG_WIN32 |
| 261 | - mkdir -p "$(DESTDIR)$(mandir)/man1" | ||
| 262 | - $(INSTALL) -m 644 qemu.1 qemu-img.1 "$(DESTDIR)$(mandir)/man1" | ||
| 263 | - mkdir -p "$(DESTDIR)$(mandir)/man8" | ||
| 264 | - $(INSTALL) -m 644 qemu-nbd.8 "$(DESTDIR)$(mandir)/man8" | 261 | + $(INSTALL_DIR) "$(DESTDIR)$(mandir)/man1" |
| 262 | + $(INSTALL_DATA) qemu.1 qemu-img.1 "$(DESTDIR)$(mandir)/man1" | ||
| 263 | + $(INSTALL_DIR) "$(DESTDIR)$(mandir)/man8" | ||
| 264 | + $(INSTALL_DATA) qemu-nbd.8 "$(DESTDIR)$(mandir)/man8" | ||
| 265 | endif | 265 | endif |
| 266 | 266 | ||
| 267 | install: all $(if $(BUILD_DOCS),install-doc) | 267 | install: all $(if $(BUILD_DOCS),install-doc) |
| 268 | - mkdir -p "$(DESTDIR)$(bindir)" | 268 | + $(INSTALL_DIR) "$(DESTDIR)$(bindir)" |
| 269 | ifneq ($(TOOLS),) | 269 | ifneq ($(TOOLS),) |
| 270 | - $(INSTALL) -m 755 $(STRIP_OPT) $(TOOLS) "$(DESTDIR)$(bindir)" | 270 | + $(INSTALL_PROG) $(STRIP_OPT) $(TOOLS) "$(DESTDIR)$(bindir)" |
| 271 | endif | 271 | endif |
| 272 | ifneq ($(BLOBS),) | 272 | ifneq ($(BLOBS),) |
| 273 | - mkdir -p "$(DESTDIR)$(datadir)" | 273 | + $(INSTALL_DIR) "$(DESTDIR)$(datadir)" |
| 274 | set -e; for x in $(BLOBS); do \ | 274 | set -e; for x in $(BLOBS); do \ |
| 275 | - $(INSTALL) -m 644 $(SRC_PATH)/pc-bios/$$x "$(DESTDIR)$(datadir)"; \ | 275 | + $(INSTALL_DATA) $(SRC_PATH)/pc-bios/$$x "$(DESTDIR)$(datadir)"; \ |
| 276 | done | 276 | done |
| 277 | endif | 277 | endif |
| 278 | ifndef CONFIG_WIN32 | 278 | ifndef CONFIG_WIN32 |
| 279 | - mkdir -p "$(DESTDIR)$(datadir)/keymaps" | 279 | + $(INSTALL_DIR) "$(DESTDIR)$(datadir)/keymaps" |
| 280 | set -e; for x in $(KEYMAPS); do \ | 280 | set -e; for x in $(KEYMAPS); do \ |
| 281 | - $(INSTALL) -m 644 $(SRC_PATH)/keymaps/$$x "$(DESTDIR)$(datadir)/keymaps"; \ | 281 | + $(INSTALL_DATA) $(SRC_PATH)/keymaps/$$x "$(DESTDIR)$(datadir)/keymaps"; \ |
| 282 | done | 282 | done |
| 283 | endif | 283 | endif |
| 284 | for d in $(TARGET_DIRS); do \ | 284 | for d in $(TARGET_DIRS); do \ |
configure
| @@ -1339,6 +1339,9 @@ echo "docdir=\${prefix}$docsuffix" >> $config_mak | @@ -1339,6 +1339,9 @@ echo "docdir=\${prefix}$docsuffix" >> $config_mak | ||
| 1339 | echo "#define CONFIG_QEMU_SHAREDIR \"$prefix$datasuffix\"" >> $config_h | 1339 | echo "#define CONFIG_QEMU_SHAREDIR \"$prefix$datasuffix\"" >> $config_h |
| 1340 | echo "MAKE=$make" >> $config_mak | 1340 | echo "MAKE=$make" >> $config_mak |
| 1341 | echo "INSTALL=$install" >> $config_mak | 1341 | echo "INSTALL=$install" >> $config_mak |
| 1342 | +echo "INSTALL_DIR=$install -d -m0755 -p" >> $config_mak | ||
| 1343 | +echo "INSTALL_DATA=$install -m0644 -p" >> $config_mak | ||
| 1344 | +echo "INSTALL_PROG=$install -m0755 -p" >> $config_mak | ||
| 1342 | echo "CC=$cc" >> $config_mak | 1345 | echo "CC=$cc" >> $config_mak |
| 1343 | echo "HOST_CC=$host_cc" >> $config_mak | 1346 | echo "HOST_CC=$host_cc" >> $config_mak |
| 1344 | echo "AR=$ar" >> $config_mak | 1347 | echo "AR=$ar" >> $config_mak |