From mboxrd@z Thu Jan 1 00:00:00 1970 From: Christoph Egger Subject: [PATCH] ioemu: build fixes for netbsd packaging Date: Fri, 15 Apr 2011 14:00:24 +0200 Message-ID: <4DA83358.3000108@amd.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------080504030201040106010805" Return-path: List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xensource.com Errors-To: xen-devel-bounces@lists.xensource.com To: "xen-devel@lists.xensource.com" , Ian Jackson List-Id: xen-devel@lists.xenproject.org --------------080504030201040106010805 Content-Type: text/plain; charset="ISO-8859-15"; format=flowed Content-Transfer-Encoding: 7bit Hi, While I was about to package Xen 4.1.0 for NetBSD, I run over some build issues which the attached patch fixes. NetBSD's pkgsrc installs the packages to /usr/pkg by default. So the patch fixes: - Installation of qemu-dm into non-default directory - Run perl scripts where perl binary is not under /usr/bin/ - Fix compatibility with texi2html-5.0 [1] Please apply this also to Xen-4.1-testing. Signed-off-by: Christoph Egger [1] The error message is this: Option number is ambiguous (number-footnotes, number-sections) Try `texi2html --help' for more information. gmake[2]: *** [qemu-tech.html] Error 2 -- ---to satisfy European Law for business letters: Advanced Micro Devices GmbH Einsteinring 24, 85689 Dornach b. Muenchen Geschaeftsfuehrer: Alberto Bozzo, Andrew Bowd Sitz: Dornach, Gemeinde Aschheim, Landkreis Muenchen Registergericht Muenchen, HRB Nr. 43632 --------------080504030201040106010805 Content-Type: text/plain; name="xen_ioemu_netbsd.diff" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="xen_ioemu_netbsd.diff" Content-Description: xen_ioemu_netbsd.diff diff --git a/Makefile b/Makefile index 37c7066..3de5022 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ # Makefile for QEMU. -include config-host.mak -include $(SRC_PATH)/rules.mak +-include config-host.mak +-include $(SRC_PATH)/rules.mak .PHONY: all clean cscope distclean dvi html info install install-doc \ recurse-all speed tar tarbin test @@ -231,30 +231,30 @@ BLOBS= 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)$(MAN1DIR)" + $(INSTALL_DATA) qemu.1 qemu-img.1 "$(DESTDIR)$(MAN1DIR)" + $(INSTALL_DIR) "$(DESTDIR)$(MAN8DIR)" + $(INSTALL_DATA) qemu-nbd.8 "$(DESTDIR)$(MAN8DIR)" endif install: all $(if $(BUILD_DOCS),install-doc) - mkdir -p "$(DESTDIR)$(bindir)" + $(INSTALL_DIR) "$(DESTDIR)$(bindir)" ifneq ($(TOOLS),) - $(INSTALL) -m 755 -s $(TOOLS) "$(DESTDIR)$(bindir)" + $(INSTALL_PROG) -s $(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 \ @@ -275,7 +275,7 @@ cscope: # documentation %.html: %.texi - texi2html -monolithic -number $< + texi2html -monolithic -number-sections $< %.info: %.texi makeinfo $< -o $@ @@ -284,15 +284,15 @@ cscope: texi2dvi $< qemu.1: qemu-doc.texi - $(SRC_PATH)/texi2pod.pl $< qemu.pod + perl $(SRC_PATH)/texi2pod.pl $< qemu.pod pod2man --section=1 --center=" " --release=" " qemu.pod > $@ qemu-img.1: qemu-img.texi - $(SRC_PATH)/texi2pod.pl $< qemu-img.pod + perl $(SRC_PATH)/texi2pod.pl $< qemu-img.pod pod2man --section=1 --center=" " --release=" " qemu-img.pod > $@ qemu-nbd.8: qemu-nbd.texi - $(SRC_PATH)/texi2pod.pl $< qemu-nbd.pod + perl $(SRC_PATH)/texi2pod.pl $< qemu-nbd.pod pod2man --section=8 --center=" " --release=" " qemu-nbd.pod > $@ info: qemu-doc.info qemu-tech.info diff --git a/configure b/configure index 904e019..689298d 100755 --- a/configure +++ b/configure @@ -1215,6 +1215,9 @@ echo "docdir=\${prefix}$docsuffix" >> $config_mak 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 --------------080504030201040106010805 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel --------------080504030201040106010805--