$NetBSD: patch-aw,v 1.2 2006/10/19 22:57:13 bouyer Exp $ --- misc/Makefile.orig 2006-10-04 04:28:16.000000000 +0200 +++ misc/Makefile 2006-10-17 00:12:40.000000000 +0200 @@ -15,27 +15,26 @@ TARGETS = xenperf xc_shadow -INSTALL_BIN = $(TARGETS) xencons -INSTALL_SBIN = netfix xm xen-bugtool xend xenperf +INSTALL_BIN = $(TARGETS) +INSTALL_BIN_SCRIPT = xencons +INSTALL_SBIN = xenperf +INSTALL_SBIN_SCRIPT = netfix xm xen-bugtool xend .PHONY: all all: build .PHONY: build build: $(TARGETS) - $(MAKE) -C miniterm -ifeq ($(CONFIG_MBOOTPACK),y) - $(MAKE) -C mbootpack -endif - $(MAKE) -C lomount .PHONY: install install: build - [ -d $(DESTDIR)/usr/bin ] || $(INSTALL_DIR) $(DESTDIR)/usr/bin - [ -d $(DESTDIR)/usr/sbin ] || $(INSTALL_DIR) $(DESTDIR)/usr/sbin - $(INSTALL_PROG) $(INSTALL_BIN) $(DESTDIR)/usr/bin - $(INSTALL_PROG) $(INSTALL_SBIN) $(DESTDIR)/usr/sbin - $(MAKE) -C lomount install + $(BSD_INSTALL_PROGRAM_DIR) $(PREFIX)/bin + $(BSD_INSTALL_PROGRAM_DIR) $(PREFIX)/sbin + $(BSD_INSTALL_PROGRAM) $(INSTALL_BIN) $(PREFIX)/bin + $(BSD_INSTALL_SCRIPT) $(INSTALL_BIN_SCRIPT) $(PREFIX)/bin + $(BSD_INSTALL_PROGRAM) $(INSTALL_SBIN) $(PREFIX)/sbin + $(BSD_INSTALL_SCRIPT) $(INSTALL_SBIN_SCRIPT) $(PREFIX)/sbin +# $(MAKE) -C lomount install # No sense in installing miniterm on the Xen box. # $(MAKE) -C miniterm install # Likewise mbootpack @@ -52,4 +51,4 @@ $(CC) -c $(CFLAGS) -o $@ $< $(TARGETS): %: %.o Makefile - $(CC) $(CFLAGS) -o $@ $< -L$(XEN_LIBXC) -lxenctrl + $(CC) $(CFLAGS) -o $@ $< $(LDFLAGS) -L$(XEN_LIBXC) -lxenctrl