Revision 670e954a Makefile.am

b/Makefile.am
201 201
	$(HS_ALL_PROGS) $(HS_BUILT_SRCS) \
202 202
	$(HS_BUILT_TEST_HELPERS) \
203 203
	src/ganeti-confd \
204
	src/ganeti-queryd \
204 205
	src/ganeti-mond \
205 206
	.hpc/*.mix src/*.tix test/hs/*.tix \
206 207
	doc/hs-lint.html
......
214 215
if WANT_HTOOLS
215 216
HS_GENERATED_FILES += $(HS_PROGS)
216 217
if ENABLE_CONFD
217
HS_GENERATED_FILES += src/hconfd src/ganeti-confd
218
HS_GENERATED_FILES += src/hconfd src/ganeti-confd src/hqueryd src/ganeti-queryd
218 219
endif
219 220

  
220 221
if ENABLE_MOND
......
478 479
HS_COMPILE_PROGS= \
479 480
	src/ganeti-mond \
480 481
	src/hconfd \
482
	src/hqueryd \
481 483
	src/rpc-test
482 484

  
483 485
# All Haskell non-test programs to be compiled but not automatically installed
......
868 870
src/ganeti-confd: src/hconfd
869 871
	cp -f $< $@
870 872

  
873
src/ganeti-queryd: src/hqueryd
874
	cp -f $< $@
875

  
871 876
nodist_sbin_SCRIPTS += src/ganeti-confd
877
nodist_sbin_SCRIPTS += src/ganeti-queryd
872 878
endif
873 879

  
874 880
if ENABLE_MOND
......
1532 1538
	  echo "RAPI_GROUP = '$(RAPI_GROUP)'"; \
1533 1539
	  echo "CONFD_USER = '$(CONFD_USER)'"; \
1534 1540
	  echo "CONFD_GROUP = '$(CONFD_GROUP)'"; \
1541
	  echo "QUERYD_USER = '$(QUERYD_USER)'"; \
1542
	  echo "QUERYD_GROUP = '$(QUERYD_GROUP)'"; \
1535 1543
	  echo "NODED_USER = '$(NODED_USER)'"; \
1536 1544
	  echo "NODED_GROUP = '$(NODED_GROUP)'"; \
1537 1545
	  echo "MOND_USER = '$(MOND_USER)'"; \
......
1613 1621
	  echo 's#@''GNTMASTERUSER@#$(MASTERD_USER)#g'; \
1614 1622
	  echo 's#@''GNTRAPIUSER@#$(RAPI_USER)#g'; \
1615 1623
	  echo 's#@''GNTCONFDUSER@#$(CONFD_USER)#g'; \
1624
	  echo 's#@''GNTQUERYDUSER@#$(QUERY_USER)#g'; \
1616 1625
	  echo 's#@''GNTNODEDUSER@#$(NODED_USER)#g'; \
1617 1626
	  echo 's#@''GNTMONDUSER@#$(MOND_USER)#g'; \
1618 1627
	  echo 's#@''GNTRAPIGROUP@#$(RAPI_GROUP)#g'; \
1619 1628
	  echo 's#@''GNTADMINGROUP@#$(ADMIN_GROUP)#g'; \
1620 1629
	  echo 's#@''GNTCONFDGROUP@#$(CONFD_GROUP)#g'; \
1630
	  echo 's#@''GNTQUERYDGROUP@#$(QUERYD_GROUP)#g'; \
1621 1631
	  echo 's#@''GNTMASTERDGROUP@#$(MASTERD_GROUP)#g'; \
1622 1632
	  echo 's#@''GNTMONDGROUP@#$(MOND_GROUP)#g'; \
1623 1633
	  echo 's#@''GNTDAEMONSGROUP@#$(DAEMONS_GROUP)#g'; \

Also available in: Unified diff