diff --git a/make/defs.mk b/make/defs.mk index cfd7b822..73149126 100644 --- a/make/defs.mk +++ b/make/defs.mk @@ -278,7 +278,6 @@ ifeq ($(VCS),cvs) endif REV_SUBDIRS = $(call reverse $(SUBDIRS)) -PCKG_DEFS_DIR = $(JWBDIR)/make/defs.d HDRDIR_SCOPE_SUFFIX ?= $(PROJECT) CONTRIB_MOD += $(addprefix contrib/,$(CONTRIB_LIBS)) @@ -406,7 +405,7 @@ INSTALLED_INIT += $(addprefix $(INSTALL_INITDIR)/,$(INIT_SCRIPTS)) INSTALLATION_FILE_TYPES += MAKE #BUILD_MAKEDIR is currently not used anywhere and costs performance. Disabled for the time being. #BUILD_MAKEDIR = $(TOPDIR)/make -MKFILES += $(filter-out pckg-defs.mk pckg-deps.mk local.mk,$(filter-out $(DONT_INSTALL),$(wildcard *.mk))) +MKFILES += $(filter-out local.mk,$(filter-out $(DONT_INSTALL),$(wildcard *.mk))) INSTALL_MAKEDIR ?= $(PREFIX)/make INSTALLED_MAKE += $(addprefix $(INSTALL_MAKEDIR)/,$(MKFILES)) diff --git a/make/make.mk b/make/make.mk index c540c447..ebcf05ee 100644 --- a/make/make.mk +++ b/make/make.mk @@ -10,7 +10,7 @@ include $(JWBDIR)/make/dev-utils.mk ifneq ($(CREATE_DEVEL),false) MKFILES += $(wildcard project.conf) - DEVEL_TARGETS += install_MAKE $(INSTALLED_PKG_MK) + DEVEL_TARGETS += install_MAKE ifeq ($(CREATE_PKG_CONFIG),true) DEVEL_TARGETS += install_PKG_CONFIG endif @@ -18,16 +18,6 @@ endif include $(JWBDIR)/make/rules.mk -INSTALL_PCKG_DEPS_DIR = $(ENV_PREFIX)$(JWBDIR)/make/deps.d -ifneq ($(wildcard pckg-deps.mk),) - INSTALLED_PKG_MK += $(INSTALL_PCKG_DEPS_DIR)/$(PROJECT).mk -endif - -INSTALL_PCKG_DEFS_DIR = $(JWBDIR)/make/defs.d -ifneq ($(wildcard pckg-defs.mk),) - INSTALLED_PKG_MK += $(INSTALL_PCKG_DEFS_DIR)/$(PROJECT).mk -endif - ifeq ($(CREATE_PKG_CONFIG),true) all: build_PKG_CONFIG endif @@ -35,14 +25,6 @@ install: install_dir_PREFIX $(DEVEL_TARGETS) clean: textclean localclean doneclean clean.pkg-config test: all -$(INSTALL_PCKG_DEPS_DIR)/$(PROJECT).mk: pckg-deps.mk - mkdir -p $(dir $@) - $(INSTALL) -p -m $(MAKEMODE) -o $(MAKEOWNER) -g $(MAKEGROUP) $< $@ - -$(INSTALL_PCKG_DEFS_DIR)/$(PROJECT).mk: pckg-defs.mk - mkdir -p $(dir $@) - $(INSTALL) -p -m $(MAKEMODE) -o $(MAKEOWNER) -g $(MAKEGROUP) $< $@ - install-links: DEVELOPMENT=false make do-install-links