Attachment #234819 for bug #37703





COMMON_DIR = common
MODULE_DIR = modules
EXT_MODULE_DIR = ext-modules
OCSPD_DIR  = ocspd
SCEP_DIR   = scep
OPENCA_SV  = openca-sv

	@if [ $(package_build) != "yes" ]; then \
		echo installing modules because it is not a package build; \
		$(MAKE) $(MODULE_DIR) SUBTARGET=install; \
		$(MAKE) $(EXT_MODULE_DIR) SUBTARGET=install; \
	else \
		echo not installing modules because it is a package build; \
		$(MAKE) $(MODULE_DIR) SUBTARGET=install; \
		$(MAKE) $(EXT_MODULE_DIR) SUBTARGET=install; \
	fi

#			$(MAKE) $(OPENCA_SV) SUBTARGET=install; \


install-modules:
	@$(MAKE) $(MODULE_DIR) SUBTARGET=install
	@$(MAKE) $(EXT_MODULE_DIR) SUBTARGET=install

test clean distclean::
		$(MAKE) $(SUBDIRS) SUBTARGET=$@

Lines 38-44 Link Here

(-)a/src/modules/Makefile (-1 / +1 lines)
38		38
39	modules::	39	modules::
40	@echo ; \	40	@echo ; \
41	echo "Build::External PERL modules" ; \	41	echo "Build::OpenCA PERL modules" ; \
42	echo ; \	42	echo ; \
43	$(MAKE) $(MODULES); \	43	$(MAKE) $(MODULES); \
44	echo	44	echo

Return to bug 37703

Lines 7-13 Link Here

(-)a/src/Makefile (-4 lines)
7		7
8	COMMON_DIR = common	8	COMMON_DIR = common
9	MODULE_DIR = modules	9	MODULE_DIR = modules
10	EXT_MODULE_DIR = ext-modules
11	OCSPD_DIR = ocspd	10	OCSPD_DIR = ocspd
12	SCEP_DIR = scep	11	SCEP_DIR = scep
13	OPENCA_SV = openca-sv	12	OPENCA_SV = openca-sv
Lines 48-58 Link Here
48	@if [ $(package_build) != "yes" ]; then \	47	@if [ $(package_build) != "yes" ]; then \
49	echo installing modules because it is not a package build; \	48	echo installing modules because it is not a package build; \
50	$(MAKE) $(MODULE_DIR) SUBTARGET=install; \	49	$(MAKE) $(MODULE_DIR) SUBTARGET=install; \
51	$(MAKE) $(EXT_MODULE_DIR) SUBTARGET=install; \
52	else \	50	else \
53	echo not installing modules because it is a package build; \	51	echo not installing modules because it is a package build; \
54	$(MAKE) $(MODULE_DIR) SUBTARGET=install; \	52	$(MAKE) $(MODULE_DIR) SUBTARGET=install; \
55	$(MAKE) $(EXT_MODULE_DIR) SUBTARGET=install; \
56	fi	53	fi
57		54
58	# $(MAKE) $(OPENCA_SV) SUBTARGET=install; \	55	# $(MAKE) $(OPENCA_SV) SUBTARGET=install; \
Lines 68-74 Link Here
68		65
69	install-modules:	66	install-modules:
70	@$(MAKE) $(MODULE_DIR) SUBTARGET=install	67	@$(MAKE) $(MODULE_DIR) SUBTARGET=install
71	@$(MAKE) $(EXT_MODULE_DIR) SUBTARGET=install
72		68
73	test clean distclean::	69	test clean distclean::
74	$(MAKE) $(SUBDIRS) SUBTARGET=$@	70	$(MAKE) $(SUBDIRS) SUBTARGET=$@