janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-26 15:23:54 +01:00
Code Activity

make: Add MOD_SCRIPT_DIR

Browse source 
Add a unified $(MOD_SCRIPT_DIR) definition and usage, ubiquitously
used but not very well tested.
This commit is contained in:
Jan Lindemann 2007-08-15 14:15:37 +00:00 • committed by Jan Lindemann
commit 13546383e0
5 changed files with 5 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

9
make/defs.mk
View file

@ -31,7 +31,8 @@ USE_YTOOLS ?= true
USE_EXCEPTIONS_IN_C ?= true USE_EXCEPTIONS_IN_C ?= true
REENTRANT ?= true REENTRANT ?= true
USE_GFILTER ?= true USE_GFILTER ?= true
OS ?= $(shell sh $(MODDIR)/devutil/scripts/get_os.sh) MOD_SCRIPT_DIR ?= $(firstword $(wildcard $(MODDIR)/devutil/scripts $(MODDIR)/bin))
OS ?= $(shell sh $(MOD_SCRIPT_DIR)/get_os.sh)
ifneq ($(shell echo $(OS) | cut -d: -f1),suse-9) ifneq ($(shell echo $(OS) | cut -d: -f1),suse-9)
SYSCONFIG_FILE ?= /etc/rc.config SYSCONFIG_FILE ?= /etc/rc.config
@ -302,12 +303,6 @@ ifeq ($(LOG_THREAD_NAMES), true)
CPPFLAGS += -DSLOG_THREAD_NAMES CPPFLAGS += -DSLOG_THREAD_NAMES
endif endif
ifneq ($(wildcard $(MODDIR)/devutil/scripts),)
MOD_SCRIPT_DIR = $(MODDIR)/devutil/scripts
else
MOD_SCRIPT_DIR = $(MODDIR)/bin
endif
ifdef INSTALL_LOG ifdef INSTALL_LOG
INSTALL=$(MOD_SCRIPT_DIR)/log_install.sh -l $(INSTALL_LOG) INSTALL=$(MOD_SCRIPT_DIR)/log_install.sh -l $(INSTALL_LOG)
LINK_LIB=$(MOD_SCRIPT_DIR)/log_install.sh -L -l $(INSTALL_LOG) LINK_LIB=$(MOD_SCRIPT_DIR)/log_install.sh -L -l $(INSTALL_LOG)

2
make/isolinux.mk
View file

@ -55,7 +55,7 @@ unpack.done: $(URL_FILE) dload.done
mv $(SYSLINUX_BASE) $(UNPACK_DIR) mv $(SYSLINUX_BASE) $(UNPACK_DIR)
touch $@ touch $@
GENERATE = sh $(MODDIR)/devutil/scripts/generate_boot_medium.sh GENERATE = sh $(MOD_SCRIPT_DIR)/generate_boot_medium.sh
BOOT_CONF = boot.conf BOOT_CONF = boot.conf
$(ISO_IMAGE): $(BOOT_CONF) dirs.done $(CD_FILES) $(ISO_IMAGE): $(BOOT_CONF) dirs.done $(CD_FILES)

2
make/proj.mk.in
View file

@ -29,7 +29,7 @@ VERSION_STR = \"@PACKAGE_VERSION@\"
DEVELOPMENT = @IS_DEVELOPMENT_VERSION@ DEVELOPMENT = @IS_DEVELOPMENT_VERSION@
# rpmdist.mk variables # rpmdist.mk variables
MKSPEC_SH = $(MODDIR)/devutil/scripts/mkspec_wrapper.sh $(TOPDIR)/make/mkspec.sh MKSPEC_SH = $(MOD_SCRIPT_DIR)/mkspec_wrapper.sh $(TOPDIR)/make/mkspec.sh
FTP_SRC_GROUP = ytsrc FTP_SRC_GROUP = ytsrc
FTP_SRC_USER = jan FTP_SRC_USER = jan
FTP_RUN_GROUP = ytrun FTP_RUN_GROUP = ytrun

2
make/rpmdist.mk
View file

@ -4,7 +4,7 @@ ifeq ($(RPM_PROJECT),)
RPM_PROJECT = $(PROJECT) RPM_PROJECT = $(PROJECT)
endif endif
MKSPEC_SH ?= $(MODDIR)/devutil/scripts/mkspec_wrapper.sh $(TOPDIR)/make/mkspec.sh MKSPEC_SH ?= $(MOD_SCRIPT_DIR)/mkspec_wrapper.sh $(TOPDIR)/make/mkspec.sh
FTP_SRC_GROUP ?= $(shell id -g) FTP_SRC_GROUP ?= $(shell id -g)
FTP_SRC_USER ?= $(shell whoami) FTP_SRC_USER ?= $(shell whoami)
FTP_RUN_GROUP ?= $(shell id -g) FTP_RUN_GROUP ?= $(shell id -g)

1
make/smart-selection.mk
View file

@ -1,5 +1,4 @@
# === variable definitions # === variable definitions
MOD_SCRIPT_DIR = $(MODDIR)/devutil/scripts
GET_OS_SH = sh $(MOD_SCRIPT_DIR)/get_os.sh GET_OS_SH = sh $(MOD_SCRIPT_DIR)/get_os.sh
GENERATE_SELECTION = sh $(MOD_SCRIPT_DIR)/generate_selection.sh GENERATE_SELECTION = sh $(MOD_SCRIPT_DIR)/generate_selection.sh
UPLOAD_SH = sh $(MOD_SCRIPT_DIR)/upload.sh UPLOAD_SH = sh $(MOD_SCRIPT_DIR)/upload.sh