diff options
| author | wiz <wiz@pkgsrc.org> | 2000-08-28 13:38:56 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2000-08-28 13:38:56 +0000 |
| commit | 4e0c3c8c05cb6492740e3b2f9161425ba42c7eb0 (patch) | |
| tree | 5a56d04abc0051694a01a9e73325f55695ffb854 /x11/fltk | |
| parent | da645e5a2e881c8190e80136bb8ef19ad2f85eb6 (diff) | |
| download | pkgsrc-4e0c3c8c05cb6492740e3b2f9161425ba42c7eb0.tar.gz | |
Don't install manually, modify program's Makefile to install in the correct
location (fixes double installation of docs found in latest bulk build).
Diffstat (limited to 'x11/fltk')
| -rw-r--r-- | x11/fltk/Makefile | 10 | ||||
| -rw-r--r-- | x11/fltk/files/patch-sum | 3 | ||||
| -rw-r--r-- | x11/fltk/patches/patch-ae | 18 |
3 files changed, 23 insertions, 8 deletions
diff --git a/x11/fltk/Makefile b/x11/fltk/Makefile index b02f955350f..5a443020206 100644 --- a/x11/fltk/Makefile +++ b/x11/fltk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2000/08/04 03:38:12 jlam Exp $ +# $NetBSD: Makefile,v 1.8 2000/08/28 13:38:56 wiz Exp $ # DISTNAME= fltk-1.0.9-source @@ -26,6 +26,8 @@ USE_LIBTOOL= # defined GNU_CONFIGURE= # defined CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" CPPFLAGS+= -I${X11PREFIX}/include # GL/GL.h +MAKE_ENV+= INSTALL_DATA_DIR="${INSTALL_DATA_DIR}" +MAKE_ENV+= INSTALL_DATA="${INSTALL_DATA}" # When the API changes and breaks binary-compatibility with the previous # version, increment the MAJOR by 1 and reset the MINOR to 0. Otherwise, @@ -35,10 +37,4 @@ FLTK_MAJOR= 1 FLTK_MINOR= 3 MAKE_ENV+= FLTK_MAJOR="${FLTK_MAJOR}" FLTK_MINOR="${FLTK_MINOR}" -DOCDIR= ${PREFIX}/share/doc/html/fltk - -post-install: - ${INSTALL_DATA_DIR} ${DOCDIR} - cd ${WRKSRC}/documentation; ${INSTALL_DATA} *.html *.gif *.jpg ${DOCDIR} - .include "../../mk/bsd.pkg.mk" diff --git a/x11/fltk/files/patch-sum b/x11/fltk/files/patch-sum index b9742bce089..bd222cf24dd 100644 --- a/x11/fltk/files/patch-sum +++ b/x11/fltk/files/patch-sum @@ -1,6 +1,7 @@ -$NetBSD: patch-sum,v 1.3 2000/08/04 03:38:15 jlam Exp $ +$NetBSD: patch-sum,v 1.4 2000/08/28 13:38:57 wiz Exp $ MD5 (patch-aa) = 689c196aa6afea369932f70001d0ee4d MD5 (patch-ab) = 7adc66d24b14b9ccf36715358f991933 MD5 (patch-ac) = efb0565495b3f17ecd4ef385ba9036cd MD5 (patch-ad) = a3f99697142bd91bfe444e342ef182e8 +MD5 (patch-ae) = 5145619039bc160ea54572b5ba5fcc7e diff --git a/x11/fltk/patches/patch-ae b/x11/fltk/patches/patch-ae new file mode 100644 index 00000000000..20a73041ec5 --- /dev/null +++ b/x11/fltk/patches/patch-ae @@ -0,0 +1,18 @@ +$NetBSD: patch-ae,v 1.1 2000/08/28 13:38:57 wiz Exp $ + +--- documentation/Makefile.orig Mon Jun 5 23:20:35 2000 ++++ documentation/Makefile +@@ -128,10 +128,9 @@ + depend: + + install: +- -mkdir -p $(prefix)/share/doc/fltk +- cp -f $(HTMLFILES) index.html $(prefix)/share/doc/fltk +- cp -f *.gif *.jpg $(prefix)/share/doc/fltk +- chmod 644 $(prefix)/share/doc/fltk/* ++ -${INSTALL_DATA_DIR} $(prefix)/share/doc/html/fltk ++ ${INSTALL_DATA} $(HTMLFILES) index.html $(prefix)/share/doc/html/fltk ++ ${INSTALL_DATA} *.gif *.jpg $(prefix)/share/doc/html/fltk + + fltk.d/index.html: $(HTMLFILES) + echo "Generating HTML documentation..." |