Index: qemu/Makefile @@ -16,6 +16,8 @@ VPATH=$(SRC_PATH):$(SRC_PATH)/hw +QEMU_CFLAGS+= -DSMBD_COMMAND=\"${LOCALBASE}/sbin/smbd\" -I${LOCALBASE}/include -DPREFIX=\"${PREFIX}\" + LIBS+=-lz $(LIBS_TOOLS) ifdef BUILD_DOCS Index: qemu/Makefile.target @@ -6,6 +6,7 @@ TARGET_PATH=$(SRC_PATH)/target-$(TARGET_BASE_ARCH) VPATH=$(SRC_PATH):$(TARGET_PATH):$(SRC_PATH)/hw QEMU_CFLAGS+= -I.. -I$(TARGET_PATH) -DNEED_CPU_H +QEMU_CFLAGS+= -DSMBD_COMMAND=\"${LOCALBASE}/sbin/smbd\" -I${LOCALBASE}/include -DPREFIX=\"${PREFIX}\" ifdef CONFIG_USER_ONLY # user emulator name Index: qemu/net.h @@ -99,12 +99,14 @@ int slirp_is_inited(void); void net_client_check(void); -#define DEFAULT_NETWORK_SCRIPT "/etc/qemu-ifup" -#define DEFAULT_NETWORK_DOWN_SCRIPT "/etc/qemu-ifdown" +#define DEFAULT_NETWORK_SCRIPT PREFIX "/etc/qemu-ifup" +#define DEFAULT_NETWORK_DOWN_SCRIPT PREFIX "/etc/qemu-ifdown" +#ifndef SMBD_COMMAND #ifdef __sun__ #define SMBD_COMMAND "/usr/sfw/sbin/smbd" #else #define SMBD_COMMAND "/usr/sbin/smbd" #endif +#endif #endif Index: qemu/net/tap.h @@ -29,8 +29,8 @@ #include "qemu-common.h" #include "qemu-option.h" -#define DEFAULT_NETWORK_SCRIPT "/etc/qemu-ifup" -#define DEFAULT_NETWORK_DOWN_SCRIPT "/etc/qemu-ifdown" +#define DEFAULT_NETWORK_SCRIPT PREFIX "/etc/qemu-ifup" +#define DEFAULT_NETWORK_DOWN_SCRIPT PREFIX "/etc/qemu-ifdown" int net_init_tap(QemuOpts *opts, Monitor *mon, const char *name, VLANState *vlan);