pkgsrc-WIP-changes archive

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

quex: Fix installation



Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Sat Apr 2 14:41:24 2016 +0200
Changeset:	1087c1c97db211b4b8d597df0e74406908029a13

Modified Files:
	quex/Makefile
	quex/PLIST
Added Files:
	quex/files/quex.sh
Removed Files:
	quex/files/quex

Log Message:
quex: Fix installation

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

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

diffstat:
 quex/Makefile      | 9 ++-------
 quex/PLIST         | 1 +
 quex/files/quex    | 5 -----
 quex/files/quex.sh | 5 +++++
 4 files changed, 8 insertions(+), 12 deletions(-)

diffs:
diff --git a/quex/Makefile b/quex/Makefile
index 6072e90..14e3141 100644
--- a/quex/Makefile
+++ b/quex/Makefile
@@ -43,12 +43,6 @@ USE_LANGUAGES=	# none
 NO_BUILD=	yes
 
 QUEX_DIR=	share/quex
-FILESDIR=	files
-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}
@@ -58,7 +52,8 @@ post-extract:
 
 do-install:
 	${RUN} cp -r ${WRKSRC}/* ${DESTDIR}${PREFIX}/${QUEX_DIR}
-	${RUN} ${INSTALL_SCRIPT} ${FILESDIR}/quex ${DESTDIR}${PREFIX}/bin
+	${RUN} ${INSTALL_SCRIPT} ${FILESDIR}/quex.sh ${DESTDIR}${PREFIX}/${QUEX_DIR}/quex.sh
+	${RUN} ln -s ${PREFIX}/${QUEX_DIR}/quex.sh ${DESTDIR}${PREFIX}/bin/quex
 
 .include "../../lang/python/application.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/quex/PLIST b/quex/PLIST
index 3519e2d..aa91bd5 100644
--- a/quex/PLIST
+++ b/quex/PLIST
@@ -272,6 +272,7 @@ share/quex/demo/make_clean.sh
 share/quex/manpage/quex.1
 share/quex/quex-exe.py
 share/quex/quex.bat
+share/quex/quex.sh
 share/quex/quex/DEFINITIONS.py
 share/quex/quex/__init__.py
 share/quex/quex/blackboard.py
diff --git a/quex/files/quex b/quex/files/quex
deleted file mode 100644
index ea81ffd..0000000
--- a/quex/files/quex
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-QUEX_PATH=@PREFIX@/@QUEX_PATH@
-export QUEX_PATH
-@PREFIX@/@QUEX_PATH@/quex-exe.py $@
diff --git a/quex/files/quex.sh b/quex/files/quex.sh
new file mode 100644
index 0000000..5dcd579
--- /dev/null
+++ b/quex/files/quex.sh
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+QUEX_PATH=`dirname "$(readlink -f "$0")"`
+export QUEX_PATH
+"$QUEX_PATH"/quex-exe.py $@


Home | Main Index | Thread Index | Old Index