From fccc7831e593a3dd1d5c255c12f83c750a2ee99d Mon Sep 17 00:00:00 2001 From: Ole Streicher Date: Sat, 2 Mar 2024 17:50:39 +0100 Subject: [PATCH] Make mkpkg customizeable This allows to set the "mkpkg" command f.e. to $(iraf)unix/bin/mkpkg.e so that x11iraf can be built completely without a fully installed mkpkg. --- ximtool/Makefile | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/ximtool/Makefile b/ximtool/Makefile index 519fce7..4a3f0ec 100644 --- a/ximtool/Makefile +++ b/ximtool/Makefile @@ -6,6 +6,12 @@ all: ximtool clients .PHONY: clients +ifdef iraf + MKPKG ?= $(iraf)unix/bin/mkpkg.e +else + MKPKG ?= mkpkg +endif + CFLAGS += -I../obm -I${TCL_INCLUDE_DIR} UNAME_S := $(shell uname -s) @@ -34,8 +40,8 @@ ximtool: $(OBJS) -lXpm $(TCL_LIB) -lXaw3d -lXmu -lXt -lXext -lX11 -lncurses -lm clients: - cd clients && mkpkg || true + cd clients && $(MKPKG) || true clean: rm -f ximtool ximtool.gui.h ximtool.html.h $(OBJS) - cd clients && mkpkg clean || true + cd clients && $(MKPKG) clean || true