# HG changeset patch
# User Olaf Wintermann <olaf.wintermann@gmail.com>
# Date 1751969423 -7200
# Node ID e93dc5b1da07de7941d97052a2457fb347f88ee6
# Parent  c9538297b89a090703923c25adaa15c732e6a892
make build lib dir adjustable, preparation for win32 build

diff -r c9538297b89a -r e93dc5b1da07 application/Makefile
--- a/application/Makefile	Mon Jul 07 20:12:56 2025 +0200
+++ b/application/Makefile	Tue Jul 08 12:10:23 2025 +0200
@@ -35,10 +35,12 @@
 
 OBJ = $(SRC:%.c=../build/application/%$(OBJ_EXT))
 
-all: ../build/bin/mk12
+APP_BIN = ../build/$(BUILD_BIN_DIR)/mk12$(APP_EXT)
 
-../build/bin/mk12: $(OBJ) $(BUILD_ROOT)/build/lib/$(LIB_PREFIX)uitk$(LIB_EXT)
-	$(LD) -o ../build/bin/mk12$(APP_EXT) $(OBJ) $(BUILD_ROOT)/build/lib/$(LIB_PREFIX)uitk$(LIB_EXT) $(BUILD_ROOT)/build/lib/$(LIB_PREFIX)ucx$(LIB_EXT) $(LDFLAGS) $(TK_LDFLAGS)
+all: $(APP_BIN)
+
+$(APP_BIN): $(OBJ) $(BUILD_ROOT)/build/$(BUILD_LIB_DIR)/$(LIB_PREFIX)uitk$(LIB_EXT)
+	$(LD) -o $(APP_BIN) $(OBJ) $(BUILD_ROOT)/build/$(BUILD_LIB_DIR)/$(LIB_PREFIX)uitk$(LIB_EXT) $(BUILD_ROOT)/build/$(BUILD_LIB_DIR)/$(LIB_PREFIX)ucx$(LIB_EXT) $(LDFLAGS) $(TK_LDFLAGS)
 
 ../build/application/%$(OBJ_EXT): %.c
 	$(CC) $(CFLAGS) $(TK_CFLAGS) -o $@ -c $<
diff -r c9538297b89a -r e93dc5b1da07 configure
--- a/configure	Mon Jul 07 20:12:56 2025 +0200
+++ b/configure	Tue Jul 08 12:10:23 2025 +0200
@@ -716,6 +716,19 @@
 done
 while true
 do
+    while true
+    do
+
+        cat >> "$TEMP_DIR/make.mk" << __EOF__
+BUILD_BIN_DIR = bin
+BUILD_LIB_DIR = lib
+__EOF__
+        break
+    done
+    break
+done
+while true
+do
     if notisplatform "bsd"; then
         break
     fi
diff -r c9538297b89a -r e93dc5b1da07 make/project.xml
--- a/make/project.xml	Mon Jul 07 20:12:56 2025 +0200
+++ b/make/project.xml	Tue Jul 08 12:10:23 2025 +0200
@@ -103,6 +103,10 @@
 		<make>LIB_PREFIX = lib</make>
 		<make>PACKAGE_SCRIPT = package_unix.sh</make>
 	</dependency>
+	<dependency>
+		<make>BUILD_BIN_DIR = bin</make>
+		<make>BUILD_LIB_DIR = lib</make>
+	</dependency>
 	
 	<dependency platform="bsd">
 		<cflags>-I/usr/local/include</cflags>
diff -r c9538297b89a -r e93dc5b1da07 ucx/Makefile
--- a/ucx/Makefile	Mon Jul 07 20:12:56 2025 +0200
+++ b/ucx/Makefile	Tue Jul 08 12:10:23 2025 +0200
@@ -49,8 +49,8 @@
 
 OBJ   = $(SRC:%.c=../build/ucx/%$(OBJ_EXT))
 
-UCX_LIB = ../build/lib/$(LIB_PREFIX)ucx$(LIB_EXT)
-UCX_SHLIB = ../build/lib/$(LIB_PREFIX)ucx$(SHLIB_EXT)
+UCX_LIB = ../build/$(BUILD_LIB_DIR)/$(LIB_PREFIX)ucx$(LIB_EXT)
+UCX_SHLIB = ../build/$(BUILD_LIB_DIR)/$(LIB_PREFIX)ucx$(SHLIB_EXT)
 
 all: $(UCX_LIB) $(UCX_SHLIB)
 
diff -r c9538297b89a -r e93dc5b1da07 ui/Makefile
--- a/ui/Makefile	Mon Jul 07 20:12:56 2025 +0200
+++ b/ui/Makefile	Tue Jul 08 12:10:23 2025 +0200
@@ -33,8 +33,8 @@
 
 include common/objs.mk
 
-UI_LIB = ../build/lib/$(LIB_PREFIX)uitk$(LIB_EXT)
-UI_SHLIB = ../build/lib/$(LIB_PREFIX)uitk$(SHLIB_EXT)
+UI_LIB = ../build/$(BUILD_LIB_DIR)/$(LIB_PREFIX)uitk$(LIB_EXT)
+UI_SHLIB = ../build/$(BUILD_LIB_DIR)/$(LIB_PREFIX)uitk$(SHLIB_EXT)
 
 include $(TOOLKIT)/objs.mk
 OBJ = $(TOOLKITOBJS) $(COMMONOBJS)