From 13546383e0ad92b8c54632420800a368cc10394c Mon Sep 17 00:00:00 2001
From: Jan Lindemann <jan@jannet.de>
Date: Wed, 15 Aug 2007 14:15:37 +0000
Subject: [PATCH] make: Add MOD_SCRIPT_DIR

Add a unified $(MOD_SCRIPT_DIR) definition and usage, ubiquitously
used but not very well tested.
---
 make/defs.mk            | 9 ++-------
 make/isolinux.mk        | 2 +-
 make/proj.mk.in         | 2 +-
 make/rpmdist.mk         | 2 +-
 make/smart-selection.mk | 1 -
 5 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/make/defs.mk b/make/defs.mk
index 58296177..931b7959 100644
--- a/make/defs.mk
+++ b/make/defs.mk
@@ -31,7 +31,8 @@ USE_YTOOLS            ?= true
 USE_EXCEPTIONS_IN_C   ?= true
 REENTRANT             ?= 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)
 SYSCONFIG_FILE        ?= /etc/rc.config
@@ -302,12 +303,6 @@ ifeq ($(LOG_THREAD_NAMES), true)
 	CPPFLAGS      += -DSLOG_THREAD_NAMES
 endif
 
-ifneq ($(wildcard $(MODDIR)/devutil/scripts),)
-	MOD_SCRIPT_DIR = $(MODDIR)/devutil/scripts
-else
-	MOD_SCRIPT_DIR = $(MODDIR)/bin
-endif
-
 ifdef INSTALL_LOG
 	INSTALL=$(MOD_SCRIPT_DIR)/log_install.sh -l $(INSTALL_LOG)
 	LINK_LIB=$(MOD_SCRIPT_DIR)/log_install.sh -L -l $(INSTALL_LOG)
diff --git a/make/isolinux.mk b/make/isolinux.mk
index f72ab01a..b150f2d0 100644
--- a/make/isolinux.mk
+++ b/make/isolinux.mk
@@ -55,7 +55,7 @@ unpack.done: $(URL_FILE) dload.done
 	mv $(SYSLINUX_BASE) $(UNPACK_DIR)
 	touch $@
 
-GENERATE = sh $(MODDIR)/devutil/scripts/generate_boot_medium.sh
+GENERATE = sh $(MOD_SCRIPT_DIR)/generate_boot_medium.sh
 BOOT_CONF = boot.conf
 
 $(ISO_IMAGE): $(BOOT_CONF) dirs.done $(CD_FILES)
diff --git a/make/proj.mk.in b/make/proj.mk.in
index 6ad41434..9c6522ca 100644
--- a/make/proj.mk.in
+++ b/make/proj.mk.in
@@ -29,7 +29,7 @@ VERSION_STR = \"@PACKAGE_VERSION@\"
 DEVELOPMENT = @IS_DEVELOPMENT_VERSION@
 
 # 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_USER     = jan
 FTP_RUN_GROUP    = ytrun
diff --git a/make/rpmdist.mk b/make/rpmdist.mk
index 7d9597bd..efb7d5d3 100644
--- a/make/rpmdist.mk
+++ b/make/rpmdist.mk
@@ -4,7 +4,7 @@ ifeq ($(RPM_PROJECT),)
 RPM_PROJECT = $(PROJECT)
 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_USER             ?= $(shell whoami)
 FTP_RUN_GROUP            ?= $(shell id -g)
diff --git a/make/smart-selection.mk b/make/smart-selection.mk
index 77a5e864..ad160375 100644
--- a/make/smart-selection.mk
+++ b/make/smart-selection.mk
@@ -1,5 +1,4 @@
 # === variable definitions
-MOD_SCRIPT_DIR          = $(MODDIR)/devutil/scripts
 GET_OS_SH               = sh $(MOD_SCRIPT_DIR)/get_os.sh
 GENERATE_SELECTION      = sh $(MOD_SCRIPT_DIR)/generate_selection.sh
 UPLOAD_SH               = sh $(MOD_SCRIPT_DIR)/upload.sh