janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-15 03:53:32 +01:00
Code Activity

$(TOPDIR), make: Add support for mkspec_wrapper.sh and dependencies

Browse source
This commit is contained in:
Jan Lindemann 2002-07-10 16:15:46 +00:00 • committed by Jan Lindemann
commit b49572da88
5 changed files with 14 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Makefile
View file

@ -12,3 +12,4 @@ clean: # distclean:
$(make_subdirs_target) $(make_subdirs_target)
install: all install: all
$(make_subdirs_target) $(make_subdirs_target)
make $(INSTALLED_VERSION_FILE)

2
VERSION
View file

@ -1 +1 @@
1.1.0-1-dev 1.1.0-2-dev

2
make/defs-orig.mk
View file

@ -116,6 +116,8 @@ INSTALL_DOCDIR_DEVEL = $(DOC_PREFIX)-devel
DOCS = $(wildcard README CHANGES TODO LICENSE AUTHORS CREDITS *.pdf *.txt *.html) DOCS = $(wildcard README CHANGES TODO LICENSE AUTHORS CREDITS *.pdf *.txt *.html)
DOCSUBDIRS = $(wildcard html tex info examples src) DOCSUBDIRS = $(wildcard html tex info examples src)
INSTALLED_VERSION_FILE = $(PREFIX)/VERSION
INSTALLED_DOCS_DIST = $(addprefix $(INSTALL_DOCDIR_DIST)/,$(DOCS)) INSTALLED_DOCS_DIST = $(addprefix $(INSTALL_DOCDIR_DIST)/,$(DOCS))
INSTALLED_DOCS_DEVEL = $(addprefix $(INSTALL_DOCDIR_DEVEL)/,$(DOCS)) INSTALLED_DOCS_DEVEL = $(addprefix $(INSTALL_DOCDIR_DEVEL)/,$(DOCS))

7
make/rpmdist.mk
View file

@ -63,10 +63,15 @@ cpmod.dist:
done done
touch $@ touch $@
ifneq ($(RPM_REQUIRED),)
RPM_REQUIRED_FLAG = "-R $(RPM_REQUIRED)"
endif
cpfiles.dist: cpfiles.dist:
mkdir -p $(DIST_SRC_DIR) mkdir -p $(DIST_SRC_DIR)
cp Makefile $(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 echo $(RPM_VERSION) > $(DIST_SRC_DIR)/VERSION
touch $@ touch $@

4
make/rules.mk
View file

@ -123,6 +123,10 @@ $(INSTALLED_PROFILE_PATH_SCRIPT):
mkdir -p $(dir $@) mkdir -p $(dir $@)
$(INSTALL) -o $(MAKEOWNER) -g $(MAKEGROUP) -m $(MAKEMODE) path_script.sh $@ $(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) ifeq ($(DEVELOPMENT),true)
install_profile_path: install_profile_path:
else else