From 77d33cb5039a2e6de34ccc5890e66891876b89a7 Mon Sep 17 00:00:00 2001
From: uebayasi <uebayasi@pkgsrc.org>
Date: Sat, 25 Jan 2003 05:26:36 +0000
Subject: Fix installed location honouring GUILE14_SUBDIR.

---
 math/cassowary/Makefile |  4 +++-
 math/cassowary/PLIST    | 18 +++++++++---------
 2 files changed, 12 insertions(+), 10 deletions(-)

(limited to 'math/cassowary')

diff --git a/math/cassowary/Makefile b/math/cassowary/Makefile
index 01466149eed..740899feeb2 100644
--- a/math/cassowary/Makefile
+++ b/math/cassowary/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2003/01/23 19:57:28 kristerw Exp $
+# $NetBSD: Makefile,v 1.16 2003/01/25 05:26:36 uebayasi Exp $
 #
 
 DISTNAME=		cassowary-0.60
@@ -21,6 +21,8 @@ GNU_CONFIGURE=		# defined
 CONFIGURE_ARGS+=	--enable-fd-solver
 CONFIGURE_ARGS+=	--with-gtl=${BUILDLINK_PREFIX.gtl}
 
+PLIST_SUBST+=		GUILE14_SUBDIR=${GUILE14_SUBDIR}
+
 YACC=			bison -y
 
 UNLIMIT_RESOURCES=	datasize memorysize
diff --git a/math/cassowary/PLIST b/math/cassowary/PLIST
index 18ea232519d..d89abb94c7f 100644
--- a/math/cassowary/PLIST
+++ b/math/cassowary/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2002/12/09 16:01:33 tron Exp $
+@comment $NetBSD: PLIST,v 1.4 2003/01/25 05:26:36 uebayasi Exp $
 bin/cassowary-config
 include/Cl.h
 include/ClC.h
@@ -43,11 +43,11 @@ include/cassowary_scm.h
 include/cassowary_scm.hpp
 include/cl-snarf.h
 lib/cassowary/tests/ClTests
-lib/guile/site/cassowary/libconstraints.a
-lib/guile/site/cassowary/libconstraints.la
-lib/guile/site/cassowary/libconstraints.so
-lib/guile/site/cassowary/libconstraints.so.0
-lib/guile/site/cassowary/libconstraints.so.0.0
+${GUILE14_SUBDIR}/lib/guile/site/cassowary/libconstraints.a
+${GUILE14_SUBDIR}/lib/guile/site/cassowary/libconstraints.la
+${GUILE14_SUBDIR}/lib/guile/site/cassowary/libconstraints.so
+${GUILE14_SUBDIR}/lib/guile/site/cassowary/libconstraints.so.0
+${GUILE14_SUBDIR}/lib/guile/site/cassowary/libconstraints.so.0.0
 lib/libcassowary.a
 lib/libcassowary.la
 lib/libcassowary.so
@@ -57,9 +57,9 @@ lib/libconstraints.a
 share/doc/cassowary/cassowary-tr.pdf
 share/doc/cassowary/cassowary-tr.ps.gz
 @dirrm share/doc/cassowary
-@dirrm lib/guile/site/cassowary
 @dirrm lib/cassowary/tests
 @dirrm lib/cassowary
 @dirrm include/cassowary
-@unexec ${RMDIR} %D/lib/guile/site 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/lib/guile 2>/dev/null || ${TRUE}
+@dirrm ${GUILE14_SUBDIR}/lib/guile/site/cassowary
+@unexec ${RMDIR} -fr %D/${GUILE14_SUBDIR}/lib/guile/site 2>/dev/null || ${TRUE}
+@unexec ${RMDIR} -fr %D/${GUILE14_SUBDIR}/lib/guile 2>/dev/null || ${TRUE}
-- 
cgit v1.2.3