--- xen-1.2.orig/xen/Makefile +++ xen-1.2/xen/Makefile @@ -19,8 +19,8 @@ install: $(TARGET) gzip -f -9 < $(TARGET) > $(TARGET).gz - mkdir -p /boot - cp -a $(TARGET).gz /boot + mkdir -p $(prefix)/boot + cp -a $(TARGET).gz $(prefix)/boot dist: $(TARGET) gzip -f -9 < $(TARGET) > $(TARGET).gz --- xen-1.2.orig/tools/examples/Makefile +++ xen-1.2/tools/examples/Makefile @@ -14,13 +14,13 @@ all: install: all - mkdir -p /usr/bin - cp -a $(INSTALL) /usr/bin + mkdir -p $(prefix)/usr/bin + cp -a $(INSTALL) $(prefix)/usr/bin #chmod 755 $(INSTALL) - mkdir -p /etc/xc - for i in $(ETC) ; do [ ! -e /etc/xc/$$i ] && echo Install $$i && cp $$i /etc/xc/ ; done || true - mkdir -p /etc/xc/auto - for i in $(INITD) ; do [ -e /etc/init.d/ ] && [ ! -e /etc/init.d/$$i ] && cp $$i /etc/init.d/ ; done || true + mkdir -p $(prefix)/etc/xc + for i in $(ETC) ; do [ ! -e $(prefix)/etc/xc/$$i ] && echo Install $$i && cp $$i $(prefix)/etc/xc/ ; done || true + mkdir -p $(prefix)/etc/xc/auto + for i in $(INITD) ; do [ -e $(prefix)/etc/init.d/ ] && [ ! -e $(prefix)/etc/init.d/$$i ] && cp $$i $(prefix)/etc/init.d/ ; done || true dist: all mkdir -p ../../../install/bin --- xen-1.2.orig/tools/misc/Makefile +++ xen-1.2/tools/misc/Makefile @@ -15,11 +15,11 @@ $(MAKE) -C miniterm install: all - mkdir -p /usr/bin - cp -a $(INSTALL) /usr/bin - chmod 755 /usr/bin/xen-mkdevnodes - chmod 755 /usr/bin/xen_nat_enable - chmod 755 /usr/bin/xen-clone + mkdir -p $(prefix)/usr/bin + cp -a $(INSTALL) $(prefix)/usr/bin + chmod 755 $(prefix)/usr/bin/xen-mkdevnodes + chmod 755 $(prefix)/usr/bin/xen_nat_enable + chmod 755 $(prefix)/usr/bin/xen-clone $(MAKE) -C miniterm install dist: all --- xen-1.2.orig/tools/misc/miniterm/Makefile +++ xen-1.2/tools/misc/miniterm/Makefile @@ -4,7 +4,7 @@ all: miniterm install: all - cp -a miniterm /usr/bin/ + cp -a miniterm $(prefix)/usr/bin/ dist: all cp -a miniterm ../../../../install/bin/ --- xen-1.2.orig/tools/xc/lib/Makefile +++ xen-1.2/tools/xc/lib/Makefile @@ -1,4 +1,7 @@ +MAJOR = 1.2 +MINOR = 0 +SONAME = libxc.so.$(MAJOR) CC = gcc CFLAGS = -c -Wall -O3 CFLAGS += -I../../../xen/include -I../../../xenolinux-sparse/include @@ -6,7 +9,7 @@ HDRS = $(wildcard *.h) OBJS = $(patsubst %.c,%.o,$(wildcard *.c)) -LIB = libxc.so +LIB = libxc.so libxc.so.$(MAJOR) libxc.so.$(MAJOR).$(MINOR) all: check-for-zlib $(LIB) @@ -19,12 +22,12 @@ fi install: all - mkdir -p /usr/lib - mkdir -p /usr/include - cp $(LIB) /usr/lib - chmod 755 /usr/lib/$(LIB) - cp xc.h /usr/include - chmod 644 /usr/include/xc.h + mkdir -p $(prefix)/usr/lib + mkdir -p $(prefix)/usr/include + cp -a $(LIB) $(prefix)/usr/lib + chmod 755 $(prefix)/usr/lib/$(LIB) + cp xc.h $(prefix)/usr/include + chmod 644 $(prefix)/usr/include/xc.h dist: all mkdir -p ../../../../install/lib @@ -46,8 +49,12 @@ mv staging/i386/*.rpm . rm -rf staging -libxc.so: $(OBJS) - $(LD) -shared -o $@ $^ -lz +libxc.so: + ln -sf libxc.so.$(MAJOR) $@ +libxc.so.$(MAJOR): + ln -sf libxc.so.$(MAJOR).$(MINOR) $@ +libxc.so.$(MAJOR).$(MINOR): $(OBJS) + $(CC) -Wl,-soname -Wl,$(SONAME) -shared -o $@ $^ -lz %.o: %.c $(HDRS) Makefile $(CC) $(CFLAGS) -o $@ $< --- xen-1.2.orig/tools/xc/py/Makefile +++ xen-1.2/tools/xc/py/Makefile @@ -1,9 +1,9 @@ -all: ../lib/libxc.so ../lib/xc.h +all: ../lib/libxc.so.1.2.0 ../lib/xc.h python setup.py build install: all - python setup.py install + python setup.py install --root "$(prefix)" dist: all mkdir -p ../../../../install/lib/python --- xen-1.2.orig/tools/balloon/Makefile +++ xen-1.2/tools/balloon/Makefile @@ -5,8 +5,8 @@ $(CC) -O2 -Wall -o $(TARGET) balloon.c install: $(TARGET) - mkdir -p /usr/bin - cp -a $(TARGET) /usr/bin + mkdir -p $(prefix)/usr/bin + cp -a $(TARGET) $(prefix)/usr/bin dist: $(TARGET) mkdir -p ../../../install/bin --- xen-1.2.orig/docs/Makefile +++ xen-1.2/docs/Makefile @@ -4,7 +4,7 @@ # Xfig and tgif diagrams should be in the fig/ subdirectory. # DOCUMENTS should be a list of the target Postscript files. -DOCUMENTS = interface.ps +DOCUMENTS = interface.ps interface.pdf GFX = $(patsubst %.obj, %.eps, $(wildcard figs/*.obj)) GFX += $(patsubst %.fig, %.eps, $(wildcard figs/*.fig)) @@ -19,6 +19,13 @@ rm -f *.ilg *.log *.ind *.toc *.bak core rm -f figs/*.eps +install: $(DOCUMENTS) + mkdir -p $(prefix)/usr/share/doc/xen + cp -a $(DOCUMENTS) VBD-HOWTO.txt Xeno-1.2-HOWTO.txt $(prefix)/usr/share/doc/xen + +%.pdf: %.ps + ps2pdf $< $@ + %.ps: %.dvi $(GFX) dvips -o $@ $<