From aa4bc767d9a3c7eed53e5248198bb407e059f33e Mon Sep 17 00:00:00 2001
From: Jan Lindemann <jan@jannet.de>
Date: Sat, 4 Sep 2004 19:46:32 +0000
Subject: [PATCH] $(TOPDIR), make, scripts: Merged changes of V_1_1_5-2 ->
 V_1_1_5-2F3

---
 CHANGES                   | 23 +++++++++++++++++++++++
 make/cfg_dev.mk           |  4 +++-
 make/cfg_dist.mk          |  3 +++
 make/defs.mk              |  6 ++++--
 make/exe.mk               |  6 ++++--
 scripts/mkspec-wrapper.sh |  4 ++--
 6 files changed, 39 insertions(+), 7 deletions(-)

diff --git a/CHANGES b/CHANGES
index 5982e5ed..ce2071f1 100644
--- a/CHANGES
+++ b/CHANGES
@@ -65,6 +65,13 @@ o replaced assert(0) with abort()
 o added client_ tcp socket options to server configuration struct
 o added some assertions to module msgfmt
 
+1.1.4-0F1
+---------
+o now not including autobuilt files in tar archive
+o now using sh instead of exec to start mkspec in mkspec_wrapper.sh, better 
+  because of permissions
+o now allowing characters in rpm patchlevel dependencies in mkspec_wrapper.sh
+
 1.1.4-1
 -------
 o jcs setval: added -n switch and fixed multi-word handling
@@ -93,6 +100,18 @@ o misc: added get_time_diff()
 o devutil/scripts: fixed comment handling
 o devutil/scripts: update.sh fixed groups and added some informational opts (-x,-p)
 
+1.1.5-2F1
+---------
+o merged changes of 1.1.4-0 -> 1.1.4-0F1
+
+1.1.5-2F2
+---------
+o now compiling distribution version with compiler debug options
+
+1.1.5-2F3
+---------
+o backported yupdate.sh and jcs from ytools 1.1.8-0
+
 1.1.6-0
 -------
 o YThread: added context argument to callbacks
@@ -147,3 +166,7 @@ o merged changes from V_1_1_5_2_FIXES and corrected YStopWatchThreadList
 o devutil/jcs and make: added support for specifying a bootlabel in kernel
   rpm build process; added asm to asm-$ARCH link in kernel include
 o devutil/jcs and make: now adding an EXTRAVERSION string to `uname -r`
+
+1.1.8-1
+-------
+o merged changes of V_1_1_5-2 -> V_1_1_5-2F3
diff --git a/make/cfg_dev.mk b/make/cfg_dev.mk
index ac9f84d1..8c643b3d 100644
--- a/make/cfg_dev.mk
+++ b/make/cfg_dev.mk
@@ -40,6 +40,9 @@ CONFIG_DIR       = $(PREFIX)/etc
 CONFIG_FILE      = $(CONFIG_DIR)/$(PROJECT).cfg
 LIBTYPE          = static
 FTP_PUB_DIR_ABS  = $(JANNET_PROJ_DIR)/$(PROJECT)
+PROFILE_DIR      = $(HOME)/.profile.d
+ROOTOWNER        = $(shell id -un)
+ROOTGROUP        = $(shell id -gn)
 
 # -- debugging options
 
@@ -56,4 +59,3 @@ USE_COMPILER_DEBUG_OPTS = true
 #LOG_THREAD_NAMES      = true
 #USE_COMPILER_OPTIMIZATION_OPTS = true
 #USE_TRACING           = true
-USE_TIMER             = true
diff --git a/make/cfg_dist.mk b/make/cfg_dist.mk
index 215c6412..b3b6d835 100644
--- a/make/cfg_dist.mk
+++ b/make/cfg_dist.mk
@@ -38,6 +38,9 @@ DOWNLOADDIRS     = root@cvs.jannet.de:/usr/local/httpd/htdocs/www.jannet.de_443/
 CONFIG_DIR       = $(PREFIX)/etc
 CONFIG_FILE      = $(CONFIG_DIR)/$(PROJECT).cfg
 LIBTYPE          = shared
+PROFILE_DIR      = $(ENV_PREFIX)/etc/profile.d
+ROOTOWNER        = root
+ROOTGROUP        = root
 
 # -- debugging options
 
diff --git a/make/defs.mk b/make/defs.mk
index 474c71ea..0fb8b83f 100644
--- a/make/defs.mk
+++ b/make/defs.mk
@@ -155,6 +155,8 @@ else
 QT_PREFIX = /usr/lib/qt2
 endif
 
+LD_LIB_PATH += $(QT_PREFIX)/lib
+
 MOC = $(QT_PREFIX)/bin/moc
 UIC = $(QT_PREFIX)/bin/uic
 
@@ -195,8 +197,8 @@ LDFLAGS   += -fprofile-arcs -ftest-coverage
 endif
 
 ifeq ($(USE_MPATROL),true)
-	PROJECT_CFLAGS      += -include $(MODDIR)/include/mpatrol.h
-	#PROJECT_CPPFLAGS    += -include $(MODDIR)/include/mpatrol.h
+	PROJECT_CFLAGS      += -include /usr/include/mpatrol.h
+	#PROJECT_CPPFLAGS    += -include /usr/include/mpatrol.h
 	PROJECT_LDFLAGS     += -lmpatrolmt -lbfd -liberty
 endif
 
diff --git a/make/exe.mk b/make/exe.mk
index d4e891a3..039c67d4 100644
--- a/make/exe.mk
+++ b/make/exe.mk
@@ -6,11 +6,13 @@
 include $(MODDIR)/make/defs.mk
 include $(MODDIR)/make/rules.mk
 
+EXPORT_LD_LIB_PATH = export LD_LIBRARY_PATH=$(shell echo $(strip $(LD_LIB_PATH)) | sed 's/ /:/g')
+
 all: $(EXE) $(EXE_BIN)
 install: $(INSTALLED_EXE) $(INSTALLED_EXE_BIN)
 run: $(EXE) $(EXE_BIN)
-	$(EXPORT_LD_LIB_PATH) ./$(EXE) $(EXE_ARGS)
+	$(EXPORT_LD_LIB_PATH); ./$(EXE) $(EXE_ARGS)
 strace: $(EXE) $(EXE_BIN)
-	$(EXPORT_LD_LIB_PATH) strace -f ./$(EXE) $(EXE_ARGS)
+	$(EXPORT_LD_LIB_PATH); strace -f ./$(EXE) $(EXE_ARGS)
 clean: execlean localclean
 
diff --git a/scripts/mkspec-wrapper.sh b/scripts/mkspec-wrapper.sh
index e38c218e..4616d4a3 100644
--- a/scripts/mkspec-wrapper.sh
+++ b/scripts/mkspec-wrapper.sh
@@ -65,7 +65,7 @@ if [ -z "$NAME" ]; then
 fi
 
 if [ -n "$REQUIRES" ]; then
-	REQUIRES_RUN=`echo $REQUIRES   | sed -e 's/\([a-zA-Z-]\+\) *\([<>=]*\) *\([0-9\.-]*\)/\1-run \2 \3,/g; s/,$//'`
+	REQUIRES_RUN=`echo $REQUIRES   | sed -e 's/\([a-zA-Z-]\+\) *\([<>=]*\) *\([a-zA-Z0-9\.-]*\)/\1-run \2 \3,/g; s/,$//'`
 	REQUIRES_DEVEL="$REQUIRES_RUN, $NAME-run = $VERSION-$RELEASE, `echo $REQUIRES_RUN | sed -e 's/-run/-devel/g'`"
 fi
 
@@ -80,5 +80,5 @@ export \
 	VERSION RELEASE V \
 	INSTALL_LOG
 
-exec $MKSPEC_SH
+sh $MKSPEC_SH