Revision 04520998 Makefile.am

b/Makefile.am
180 180
HTOOLS_GENERATED_FILES =
181 181
if WANT_HTOOLS
182 182
HTOOLS_GENERATED_FILES += $(HS_PROGS)
183
if HS_CONFD
183
if ENABLE_CONFD
184 184
HTOOLS_GENERATED_FILES += htools/hconfd
185 185
endif
186 186
endif
......
567 567
	daemons/ganeti-rapi \
568 568
	$(gnt_scripts)
569 569

  
570
if PY_CONFD
571
PYTHON_BOOTSTRAP_SBIN += daemons/ganeti-confd
572
endif
573

  
574 570
PYTHON_BOOTSTRAP = \
575 571
	$(PYTHON_BOOTSTRAP_SBIN) \
576 572
	tools/ensure-dirs
......
604 600
		$(LN_S) -f htools \
605 601
			   $(DESTDIR)$(bindir)/$$role ; \
606 602
	done
607
if HS_CONFD
603
if ENABLE_CONFD
608 604
	mv $(DESTDIR)$(sbindir)/hconfd $(DESTDIR)$(sbindir)/ganeti-confd
609 605
endif
610 606
endif
......
657 653
	daemons/ganeti-cleaner \
658 654
	daemons/ganeti-master-cleaner
659 655

  
660
if HS_CONFD
656
if ENABLE_CONFD
661 657
nodist_sbin_SCRIPTS += htools/hconfd
662 658
endif
663 659

  
......
1249 1245
	    echo "HTOOLS = False"; \
1250 1246
	  fi; \
1251 1247
	  echo "ENABLE_CONFD = $(ENABLE_CONFD)"; \
1252
	  echo "PY_CONFD = $(PY_CONFD)"; \
1253
	  echo "HS_CONFD = $(HS_CONFD)"; \
1254 1248
	  echo "XEN_CMD = '$(XEN_CMD)'"; \
1255 1249
	  echo "ENABLE_SPLIT_QUERY = $(ENABLE_SPLIT_QUERY)"; \
1256 1250
	} > $@

Also available in: Unified diff