diff --git a/Makefile b/Makefile index 49cc287a..549f5409 100644 --- a/Makefile +++ b/Makefile @@ -12,3 +12,4 @@ clean: # distclean: $(make_subdirs_target) install: all $(make_subdirs_target) + make $(INSTALLED_VERSION_FILE) diff --git a/VERSION b/VERSION index eef70026..a65a1866 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.1.0-1-dev +1.1.0-2-dev diff --git a/make/defs-orig.mk b/make/defs-orig.mk index fd8a2a11..2ebd2ad6 100644 --- a/make/defs-orig.mk +++ b/make/defs-orig.mk @@ -116,6 +116,8 @@ INSTALL_DOCDIR_DEVEL = $(DOC_PREFIX)-devel DOCS = $(wildcard README CHANGES TODO LICENSE AUTHORS CREDITS *.pdf *.txt *.html) DOCSUBDIRS = $(wildcard html tex info examples src) +INSTALLED_VERSION_FILE = $(PREFIX)/VERSION + INSTALLED_DOCS_DIST = $(addprefix $(INSTALL_DOCDIR_DIST)/,$(DOCS)) INSTALLED_DOCS_DEVEL = $(addprefix $(INSTALL_DOCDIR_DEVEL)/,$(DOCS)) diff --git a/make/rpmdist.mk b/make/rpmdist.mk index 39933e3d..85f29437 100644 --- a/make/rpmdist.mk +++ b/make/rpmdist.mk @@ -63,10 +63,15 @@ cpmod.dist: done touch $@ +ifneq ($(RPM_REQUIRED),) +RPM_REQUIRED_FLAG = "-R $(RPM_REQUIRED)" +endif + cpfiles.dist: mkdir -p $(DIST_SRC_DIR) cp Makefile $(DIST_SRC_DIR) - sh $(MKSPEC_SH) -V $(RPM_VERSION) -S $(notdir $(PCKG_TAR)) -N $(RPM_PROJECT) > $(DIST_SRC_DIR)/$(RPM_PROJECT)-$(RPM_VERSION).spec + sh $(MKSPEC_SH) -V $(RPM_VERSION) -S $(notdir $(PCKG_TAR)) -N $(RPM_PROJECT) $(RPM_REQUIRED_FLAG) \ + > $(DIST_SRC_DIR)/$(RPM_PROJECT)-$(RPM_VERSION).spec echo $(RPM_VERSION) > $(DIST_SRC_DIR)/VERSION touch $@ diff --git a/make/rules.mk b/make/rules.mk index 4848ac90..dd38b1ac 100644 --- a/make/rules.mk +++ b/make/rules.mk @@ -123,6 +123,10 @@ $(INSTALLED_PROFILE_PATH_SCRIPT): mkdir -p $(dir $@) $(INSTALL) -o $(MAKEOWNER) -g $(MAKEGROUP) -m $(MAKEMODE) path_script.sh $@ +$(INSTALLED_VERSION_FILE): + $(INSTALL) -o $(MAKEOWNER) -g $(MAKEGROUP) -m $(MAKEMODE) $(TOPDIR)/VERSION $@ + echo $(DIST_VERSION) > $@ + ifeq ($(DEVELOPMENT),true) install_profile_path: else