include $(TOP)/mk/boilerplate.mk
# find the projects that actually exist...
-SUBDIRS = $(filter $(patsubst %/, %, $(wildcard */)), $(AllProjects))
+ProjectsThatExist = $(filter $(patsubst %/, %, $(wildcard */)), $(AllProjects))
# and filter only those that the user requested, if necessary
ifeq "$(ProjectsToBuild)" ""
-Projects = $(SUBDIRS)
+SUBDIRS = $(ProjectsThatExist)
else
-Projects = $(filter $(ProjectsToBuild), $(SUBDIRS))
+SUBDIRS = $(filter $(ProjectsToBuild), $(ProjectsThatExist))
endif
ifneq "$(Project)" ""
fi
# -----------------------------------------------------------------------------
-# Make sure configure is up-to-date
-
-all install dist binary-dist :: configure
-configure :: configure.in
- @echo "WARNING: configure needs to be regenerated. Type"
- @echo " make -f Makefile.config ./configure"
- @echo "and rerun make."
- @exit 16
-
-# -----------------------------------------------------------------------------
# Making a binary distribution
#
# To make a particular binary distribution:
@echo "Generating a shippable configure script.."
$(MV) $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/configure-bin.in $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/configure.in
( cd $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME); autoconf )
- cp $(BIN_DIST_MAIN_DIR)/mk/post-install-script $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)
+ if test -x $(BIN_DIST_MAIN_DIR)/mk/post-install-script ; then \
+ cp $(BIN_DIST_MAIN_DIR)/mk/post-install-script \
+ $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME) ; \
+ fi
+ if test -x $(BIN_DIST_MAIN_DIR)/mk/post-inplace-script ; then \
+ cp $(BIN_DIST_MAIN_DIR)/mk/post-inplace-script \
+ $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME) ; \
+ fi
#
# binary dist'ing the documentation.
# Which documentation to build/install is hardcoded below.
#
# Files to include in source distributions
#
-SRC_DIST_DIRS += docs distrib $(Projects)
+SRC_DIST_DIRS += docs distrib $(SUBDIRS)
SRC_DIST_FILES += \
configure.in config.guess config.sub configure \
aclocal.m4 acconfig.h README Makefile install-sh \
+ mk/bootstrap.mk \
mk/boilerplate.mk mk/config.h.in mk/config.mk.in mk/opts.mk \
mk/paths.mk mk/suffix.mk mk/target.mk
all ::
@case '${MFLAGS}' in *-[ik]*) x_on_err=0;; *-r*[ik]*) x_on_err=0;; *) x_on_err=1;; esac; \
- for i in $(Projects); do \
+ for i in $(SUBDIRS); do \
if [ -d $$i ]; then \
$(MAKE) -C $$i boot all; \
if [ $$? -eq 0 -o $$x_on_err -eq 0 ] ; then true; else exit 1; fi; \
install ::
@case '${MFLAGS}' in *-[ik]*) x_on_err=0;; *-r*[ik]*) x_on_err=0;; *) x_on_err=1;; esac; \
- for i in $(filter-out $(ProjectsDontInstall), $(Projects)); do \
+ for i in $(filter-out $(ProjectsDontInstall), $(SUBDIRS)); do \
if [ -d $$i ]; then \
$(MAKE) -C $$i install; \
if [ $$? -eq 0 -o $$x_on_err -eq 0 ] ; then true; else exit 1; fi; \