run/.tree-stamp: $(o)/config.mk
$(M)Creating runtree
- $(Q)mkdir -p run $(addprefix run/, cf $(EXTRA_RUNDIRS) $(INSTALL_RUNDIRS))
+ $(Q)mkdir -p run $(addprefix run/, $(CONFIG_DIR) $(EXTRA_RUNDIRS) $(INSTALL_RUNDIRS))
$(Q)touch run/.tree-stamp
# Miscellaneous targets
programs: $(PROGS)
datafiles: $(DATAFILES)
tests: $(TESTS)
-configs: $(addprefix run/cf/,$(CONFIGS))
+configs: $(addprefix run/$(CONFIG_DIR)/,$(CONFIGS))
tags:
etags `find . -name "*.[ch]"`
# Rules for configuration files
-run/cf/%: $(s)/cf/% $(o)/config.mk $(s)/build/genconf
+run/$(CONFIG_DIR)/%: $(s)/$(CONFIG_DIR)/% $(o)/config.mk $(s)/build/genconf
$(M)CF $<
$(Q)$(s)/build/genconf $< $@ $(o)/config.mk
$(o)/%.cf: $(s)/%.cf $(o)/config.mk $(s)/build/genconf
$(M)CF $<
$(Q)$(s)/build/genconf $< $@ $(o)/config.mk
- $(Q)cp $@ run/cf/$(basename $(@F))
+ $(Q)cp $@ run/$(CONFIG_DIR)/$(basename $(@F))
# Rules for libraries
ifdef CONFIG_INSTALL_API
+ifdef CONFIG_LOCAL
+# Need an absolute path
API_ROOT:=$(shell pwd)/run
+API_LIBDIR=$(API_ROOT)/lib
+API_INCDIR=$(API_ROOT)/include
+else
+API_LIBDIR=$(INSTALL_LIB_DIR)
+API_INCDIR=$(INSTALL_INCLUDE_DIR)
+endif
INSTALL_RUNDIRS+=include lib/pkgconfig
api: $(API_INCLUDES) $(addprefix run/lib/pkgconfig/,$(addsuffix .pc,$(API_LIBS)))
run/lib/pkgconfig/%.pc: # RHS supplied in the sub-makefile
$(M)PC-API $@
- $(Q)sed <$< >$@ "s@^libdir=.*@libdir=$(API_ROOT)/lib@;s@^incdir=.*@incdir=$(API_ROOT)/include@"
+ $(Q)sed <$< >$@ "s@^libdir=.*@libdir=$(API_LIBDIR)@;s@^incdir=.*@incdir=$(API_INCDIR)@"
else
api: