Revision 8fbf7acb Makefile.am

b/Makefile.am
7 7
windows_support=no
8 8
endif
9 9

  
10
osdir=$(OS_DIR)/$(OS_NAME)
10 11
configdir=${sysconfdir}/ganeti/instance-image
11 12
variantsdir=${sysconfdir}/ganeti/instance-image/variants
12 13
networksdir=${sysconfdir}/ganeti/instance-image/networks
13 14
overlaysdir=${sysconfdir}/ganeti/instance-image/overlays
14
toolsdir=$(osdir)/$(osname)/tools
15
toolsdir=$(osdir)/tools
15 16

  
16 17
dist_os_SCRIPTS = ${srcdir}/create ${srcdir}/import ${srcdir}/export ${srcdir}/rename ${srcdir}/verify
17 18
dist_tools_SCRIPTS = ${srcdir}/tools/snf-passtohash.py
......
51 52
	   -e 's|@INSTALL_MBR[@]|$(INSTALL_MBR)|g'
52 53
	   
53 54

  
54
tools_builddir:
55
toolsbuilddir: $(builddir)/tools
55 56
	@mkdir_p@ tools
56 57

  
57
$(tools_SCRIPTS) common.sh: Makefile
58
common.sh: Makefile
59
	rm -f $@ $@.tmp
60
	srcdir=''; \
61
		   test -f ./$@.in || srcdir=$(srcdir)/; \
62
		   $(edit) $${srcdir}$@.in >$@.tmp
63
	mv $@.tmp $@
64

  
65
$(tools_SCRIPTS): Makefile
66
	@mkdir_p@ tools
58 67
	rm -f $@ $@.tmp
59 68
	srcdir=''; \
60 69
		   test -f ./$@.in || srcdir=$(srcdir)/; \
......
62 71
	mv $@.tmp $@
63 72

  
64 73
common.sh: $(srcdir)/common.sh.in
65
tools/make-dump: $(srcdir)/tools/make-dump.in tools_builddir
66
tools/make-qemu-img: $(srcdir)/tools/make-qemu-img.in tools_builddir
67
tools/mount-disks: $(srcdir)/tools/mount-disks.in tools_builddir
68
tools/umount-disks: $(srcdir)/tools/umount-disks.in tools_builddir
74
tools/make-dump: $(srcdir)/tools/make-dump.in
75
tools/make-qemu-img: $(srcdir)/tools/make-qemu-img.in
76
tools/mount-disks: $(srcdir)/tools/mount-disks.in
77
tools/umount-disks: $(srcdir)/tools/umount-disks.in
69 78

  
70 79
install-exec-local:
71
	@mkdir_p@ "$(DESTDIR)$(osdir)/$(osname)"
80
	@mkdir_p@ "$(DESTDIR)$(osdir)"
72 81
	@mkdir_p@ "$(DESTDIR)$(variantsdir)"
73 82
	@mkdir_p@ "$(DESTDIR)$(networksdir)/subnets"
74 83
	@mkdir_p@ "$(DESTDIR)$(networksdir)/instances"

Also available in: Unified diff