diff options
| author | jlam <jlam@pkgsrc.org> | 2001-05-26 07:23:34 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2001-05-26 07:23:34 +0000 |
| commit | f077d7fbc0774c3fbfd4d26e049a7340d86d2837 (patch) | |
| tree | 397ca1eb191e4d31cd555a2caa85a861de8fc02a /print | |
| parent | 95185453b5a576f51b52d5bae15f359e4e5c31fc (diff) | |
| download | pkgsrc-f077d7fbc0774c3fbfd4d26e049a7340d86d2837.tar.gz | |
No functional change...just rework some code and resort some lines.
Diffstat (limited to 'print')
| -rw-r--r-- | print/cups/buildlink.mk | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/print/cups/buildlink.mk b/print/cups/buildlink.mk index 6dfd8a49bc1..b44781c223e 100644 --- a/print/cups/buildlink.mk +++ b/print/cups/buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink.mk,v 1.2 2001/05/26 05:44:10 jlam Exp $ +# $NetBSD: buildlink.mk,v 1.3 2001/05/26 07:23:34 jlam Exp $ # # This Makefile fragment is included by packages that use libcups. # @@ -17,14 +17,12 @@ CUPS_BUILDLINK_MK= # defined CUPS_REQD?= 1.1.1 - -CUPS_INCDIR= ${LOCALBASE}/include/cups -LIBCUPS= ${LOCALBASE}/lib/libcups.a -LIBCUPS= ${LOCALBASE}/lib/libcups.so* -LIBCUPSIMAGE= ${LOCALBASE}/lib/libcupsimage.a -LIBCUPSIMAGE= ${LOCALBASE}/lib/libcupsimage.so* DEPENDS+= cups>=${CUPS_REQD}:../../print/cups +CUPS_HEADERS= ${LOCALBASE}/include/cups/* +CUPS_LIBS= ${LOCALBASE}/lib/libcups.* +CUPS_LIBS+= ${LOCALBASE}/lib/libcupsimage.* + BUILDLINK_INCDIR?= ${WRKDIR}/include BUILDLINK_LIBDIR?= ${WRKDIR}/lib @@ -37,7 +35,8 @@ BUILDLINK_TARGETS+= link-cups-libs link-cups-headers: @${ECHO} "Linking cups headers into ${BUILDLINK_INCDIR}." @${MKDIR} ${BUILDLINK_INCDIR}/cups - @for inc in ${CUPS_INCDIR}/*; do \ + @${RM} -f ${BUILDLINK_INCDIR}/cups/* + @for inc in ${CUPS_HEADERS}; do \ dest=${BUILDLINK_INCDIR}/cups/`${BASENAME} $${inc}`; \ if [ -f $${inc} ]; then \ ${RM} -f $${dest}; \ @@ -51,7 +50,7 @@ link-cups-headers: link-cups-libs: @${ECHO} "Linking cups libraries into ${BUILDLINK_LIBDIR}." @${MKDIR} ${BUILDLINK_LIBDIR} - @for lib in ${LIBCUPS} ${LIBCUPSIMAGE}; do \ + @for lib in ${CUPS_LIBS}; do \ dest=${BUILDLINK_LIBDIR}/`${BASENAME} $${lib}`; \ if [ -f $${lib} ]; then \ ${RM} -f $${dest}; \ |