From 67c5fd6bb8f1d489f7dd012a63a370f20fbe02da Mon Sep 17 00:00:00 2001 From: Roy Marples Date: Sun, 2 Mar 2008 21:14:01 +0000 Subject: Ensure that our scripts call prefixed runscript. --- mk/scripts.mk | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'mk') diff --git a/mk/scripts.mk b/mk/scripts.mk index 561545de..5693dc15 100644 --- a/mk/scripts.mk +++ b/mk/scripts.mk @@ -1,12 +1,12 @@ # Install rules for our scripts # Copyright 2007-2008 Roy Marples -_IN_SH= ls -1 | sed -n -e 's:\.in$$::p' | xargs +_IN_SH= ls -1 | sed -n -e 's:\.in$$::p' | xargs; echo _IN!= ${_IN_SH} OBJS+= ${_IN}$(shell ${_IN_SH}) # We store the contents of the directory for ease of use in Makefiles -_CONTENTS_SH= ls -1 | grep -v "\(Makefile\|.in$$\)" | sed -e 's:\.in$$::g' | xargs +_CONTENTS_SH= ls -1 | grep -v Makefile | sed -e 's:\.in$$::g' | sort -u | xargs _CONTENTS!= ${_CONTENTS_SH} CONTENTS= ${_CONTENTS}$(shell ${_CONTENTS_SH}) @@ -14,10 +14,13 @@ include ${MK}/sys.mk include ${MK}/os.mk # Tweak our shell scripts -.SUFFIXES: .sh.in +.SUFFIXES: .sh.in .in .sh.in.sh: sed -e 's:@SHELL@:${SH}:g' -e 's:@LIB@:${LIBNAME}:g' -e 's:@PREFIX@:${PREFIX}:g' -e 's:@PKG_PREFIX@:${PKG_PREFIX}:g' $< > $@ +.in: + sed -e 's:@PREFIX@:${PREFIX}:g' -e 's:@PKG_PREFIX@:${PKG_PREFIX}:g' $< > $@ + all: ${OBJS} realinstall: ${BIN} ${CONF} ${CONF_APPEND} -- cgit v1.2.3