[pkgsrc/trunk]: pkgsrc/devel/libltdl Add LIBLTDL_CONVENIENCE_SUBDIR variable ...

[tv <tv%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/3180496243f5
branches:  trunk
changeset: 486201:3180496243f5
user:      tv <tv%pkgsrc.org@localhost>
date:      Fri Dec 24 23:44:30 2004 +0000

description:
Add LIBLTDL_CONVENIENCE_SUBDIR variable to allow packages to indicate that
bundled libltdl is not in the subdir "libltdl".

diffstat:

 devel/libltdl/convenience.mk |  21 +++++++++++----------
 1 files changed, 11 insertions(+), 10 deletions(-)

diffs (34 lines):

diff -r a12375daa66e -r 3180496243f5 devel/libltdl/convenience.mk
--- a/devel/libltdl/convenience.mk      Fri Dec 24 23:42:49 2004 +0000
+++ b/devel/libltdl/convenience.mk      Fri Dec 24 23:44:30 2004 +0000
@@ -1,19 +1,20 @@
-# $NetBSD: convenience.mk,v 1.4 2004/11/15 12:19:40 sketch Exp $
+# $NetBSD: convenience.mk,v 1.5 2004/12/24 23:44:30 tv Exp $
 #
 # Override "libltdlc.la" -- the libltdl "convenience" library embedded into
 # programs that ship with libltdl.  Also override packages attempting to
 # build and install the full "libltdl.la".
 
+LIBLTDL_CONVENIENCE_SUBDIR?=   libltdl
+
 post-patch: fix-libltdlc
 fix-libltdlc:
-       ${ECHO} 'all install clean:' >${WRKSRC}/libltdl/Makefile.in
-       ${ECHO} 'all install clean:' >${WRKSRC}/libltdl/Makefile
-       ${RM} -f ${WRKSRC}/libltdl/Makefile.am ${WRKSRC}/libltdl/configure*
-       ${RM} -f ${WRKSRC}/libltdl/ltdl.h
-       ${LN} -s ${BUILDLINK_DIR}/include/ltdl.h ${WRKSRC}/libltdl/ltdl.h
-       ${RM} -f ${WRKSRC}/libltdl/libltdl.la
-       ${LN} -s ${BUILDLINK_DIR}/lib/libltdl.la ${WRKSRC}/libltdl/libltdl.la
-       ${RM} -f ${WRKSRC}/libltdl/libltdlc.la
-       ${LN} -s ${BUILDLINK_DIR}/lib/libltdl.la ${WRKSRC}/libltdl/libltdlc.la
+       @${ECHO} 'Fixing libltdl convenience library linkage.'
+       @cd ${WRKSRC}/${LIBLTDL_CONVENIENCE_SUBDIR} && \
+               ${ECHO} 'all install clean:' >Makefile.in && \
+               ${ECHO} 'all install clean:' >Makefile && \
+               ${RM} -f Makefile.am configure* ltdl.h *.la && \
+               ${LN} -s ${BUILDLINK_DIR}/include/ltdl.h ltdl.h && \
+               ${LN} -s ${BUILDLINK_DIR}/lib/libltdl.la libltdl.la && \
+               ${LN} -s ${BUILDLINK_DIR}/lib/libltdl.la libltdlc.la
 
 .include "../../devel/libltdl/buildlink3.mk"