pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

quex: Try to fix string substitution with FILES_SUBST



Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Thu Mar 31 04:06:29 2016 +0200
Changeset:	65182c04b1762996783ffb8f37bd09e8bc29c62d

Modified Files:
	quex/Makefile
	quex/files/quex

Log Message:
quex: Try to fix string substitution with FILES_SUBST

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=65182c04b1762996783ffb8f37bd09e8bc29c62d

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 quex/Makefile   | 5 ++++-
 quex/files/quex | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diffs:
diff --git a/quex/Makefile b/quex/Makefile
index 38eade7..6072e90 100644
--- a/quex/Makefile
+++ b/quex/Makefile
@@ -44,9 +44,12 @@ NO_BUILD=	yes
 
 QUEX_DIR=	share/quex
 FILESDIR=	files
-FILES_SUBST+=	QUEX_DIR=${PREFIX}${QUEX_DIR}
+FILES_SUBST+=	QUEX_DIR=${QUEX_DIR}
 FILES_SUBST+=	PREFIX=${PREFIX}
 
+BUILD_DEFS+=	QUEX_DIR
+BUILD_DEFS+=	PREFIX
+
 INSTALLATION_DIRS=	${PREFIX}/bin
 INSTALLATION_DIRS+=	${PREFIX}/${QUEX_DIR}
 
diff --git a/quex/files/quex b/quex/files/quex
index 603166f..ea81ffd 100644
--- a/quex/files/quex
+++ b/quex/files/quex
@@ -1,5 +1,5 @@
 #!/bin/sh
 
-QUEX_PATH=@QUEX_PATH@
+QUEX_PATH=@PREFIX@/@QUEX_PATH@
 export QUEX_PATH
 @PREFIX@/@QUEX_PATH@/quex-exe.py $@


Home | Main Index | Thread Index | Old Index