Changes 20110222: * Did a lot of work to improve the accuracy in remove overlap. Improved accuracy means that it is less likely to do the wrong thing. Problems happen when there are points or intersections very close to each other. (So quadratic glyphs are more likely to have problems than cubics simply because they have more points, on average). * Fix various error messages. * Remove some obsolete documentation. * Technical fixes to stroking code. * Add a miterlimit to stroking code. * FontForge was using the wrong MIME type for svg files. W3C has changed it and it's now "image/svg+xml" not "image/svg-xml" or "image/svg". * Since Inkscape images tend to be at unexpected y positions, force the view to rescale/recenter itself if the result after a paste/import is outside the current window. (Inkscape tends to put things at the top of a page, but the origin is at the bottom, and FF looks at the origin. * A line joint of 180 degrees (which shouldn't have happened in stroking, but did) caused an infinite loop. * Typo in add extrema code (again). * More...diff -r1.72 -r1.73 pkgsrc/fonts/fontforge/Makefile
(adam)
@@ -1,45 +1,45 @@ | @@ -1,45 +1,45 @@ | |||
1 | # $NetBSD: Makefile,v 1.72 2011/04/22 13:43:31 obache Exp $ | 1 | # $NetBSD: Makefile,v 1.73 2011/05/02 11:15:41 adam Exp $ | |
2 | 2 | |||
3 | DISTNAME= fontforge_full-${VERSION} | 3 | DISTNAME= fontforge_full-${VERSION} | |
4 | PKGNAME= fontforge-${VERSION} | 4 | PKGNAME= fontforge-${VERSION} | |
5 | PKGREVISION= 7 | |||
6 | CATEGORIES= fonts editors | 5 | CATEGORIES= fonts editors | |
7 | MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=fontforge/} | 6 | MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=fontforge/} | |
8 | EXTRACT_SUFX= .tar.bz2 | 7 | EXTRACT_SUFX= .tar.bz2 | |
9 | 8 | |||
10 | MAINTAINER= adam@NetBSD.org | 9 | MAINTAINER= adam@NetBSD.org | |
11 | HOMEPAGE= http://fontforge.sourceforge.net/ | 10 | HOMEPAGE= http://fontforge.sourceforge.net/ | |
12 | COMMENT= Postscript font editor | 11 | COMMENT= Postscript font editor | |
12 | LICENSE= modified-bsd | |||
13 | 13 | |||
14 | VERSION= 20100501 | 14 | VERSION= 20110222 | |
15 | 15 | |||
16 | PKG_DESTDIR_SUPPORT= user-destdir | 16 | PKG_DESTDIR_SUPPORT= user-destdir | |
17 | 17 | |||
18 | WRKSRC= ${WRKDIR}/${PKGNAME_NOREV} | 18 | WRKSRC= ${WRKDIR}/${PKGNAME_NOREV} | |
19 | 19 | |||
20 | MAKE_ENV+= PKGLOCALEDIR=${PKGLOCALEDIR} | |||
21 | ||||
22 | GNU_CONFIGURE= yes | |||
23 | USE_LANGUAGES= c | 20 | USE_LANGUAGES= c | |
24 | USE_LIBTOOL= yes | 21 | USE_LIBTOOL= yes | |
25 | USE_PKGLOCALEDIR= yes | 22 | USE_PKGLOCALEDIR= yes | |
26 | USE_TOOLS+= gmake msgfmt | 23 | USE_TOOLS+= gmake msgfmt | |
24 | GNU_CONFIGURE= yes | |||
27 | CONFIGURE_ARGS+= --without-freetype-src | 25 | CONFIGURE_ARGS+= --without-freetype-src | |
28 | CONFIGURE_ARGS+= --without-python | 26 | CONFIGURE_ARGS+= --without-python | |
29 | BROKEN_GETTEXT_DETECTION= yes | |||
30 | 27 | |||
28 | MAKE_ENV+= PKGLOCALEDIR=${PKGLOCALEDIR} | |||
31 | LDFLAGS.SunOS+= -lrt | 29 | LDFLAGS.SunOS+= -lrt | |
32 | 30 | |||
31 | BROKEN_GETTEXT_DETECTION= yes | |||
32 | ||||
33 | .include "options.mk" | 33 | .include "options.mk" | |
34 | 34 | |||
35 | .include "../../converters/libiconv/buildlink3.mk" | 35 | .include "../../converters/libiconv/buildlink3.mk" | |
36 | .include "../../devel/gettext-lib/buildlink3.mk" | 36 | .include "../../devel/gettext-lib/buildlink3.mk" | |
37 | .include "../../devel/pango/buildlink3.mk" | 37 | .include "../../devel/pango/buildlink3.mk" | |
38 | .include "../../graphics/cairo/buildlink3.mk" | 38 | .include "../../graphics/cairo/buildlink3.mk" | |
39 | .include "../../graphics/freetype2/buildlink3.mk" | 39 | .include "../../graphics/freetype2/buildlink3.mk" | |
40 | .include "../../mk/jpeg.buildlink3.mk" | |||
41 | .include "../../mk/giflib.buildlink3.mk" | |||
42 | .include "../../graphics/png/buildlink3.mk" | 40 | .include "../../graphics/png/buildlink3.mk" | |
43 | .include "../../graphics/tiff/buildlink3.mk" | 41 | .include "../../graphics/tiff/buildlink3.mk" | |
44 | .include "../../textproc/libxml2/buildlink3.mk" | 42 | .include "../../textproc/libxml2/buildlink3.mk" | |
43 | .include "../../mk/giflib.buildlink3.mk" | |||
44 | .include "../../mk/jpeg.buildlink3.mk" | |||
45 | .include "../../mk/bsd.pkg.mk" | 45 | .include "../../mk/bsd.pkg.mk" |
@@ -1,61 +1,61 @@ | @@ -1,61 +1,61 @@ | |||
1 | @comment $NetBSD: PLIST,v 1.29 2010/05/21 06:34:23 adam Exp $ | 1 | @comment $NetBSD: PLIST,v 1.30 2011/05/02 11:15:42 adam Exp $ | |
2 | bin/fontforge | 2 | bin/fontforge | |
3 | bin/fontimage | 3 | bin/fontimage | |
4 | bin/fontlint | 4 | bin/fontlint | |
5 | bin/sfddiff | 5 | bin/sfddiff | |
6 | include/fontforge/PfEd.h | 6 | include/fontforge/PfEd.h | |
7 | include/fontforge/autowidth.h | 7 | include/fontforge/autowidth.h | |
8 | include/fontforge/autowidth2.h | 8 | include/fontforge/autowidth2.h | |
9 | include/fontforge/baseviews.h | 9 | include/fontforge/baseviews.h | |
10 | include/fontforge/basics.h | 10 | include/fontforge/basics.h | |
11 | include/fontforge/bezctx_ff.h | 11 | include/fontforge/bezctx_ff.h | |
12 | include/fontforge/bitmapcontrol.h | 12 | include/fontforge/bitmapcontrol.h | |
13 | include/fontforge/chardata.h | 13 | include/fontforge/chardata.h | |
14 | include/fontforge/charset.h | 14 | include/fontforge/charset.h | |
15 | include/fontforge/config.h | 15 | include/fontforge/config.h | |
16 | include/fontforge/configure-pfaedit.h | 16 | include/fontforge/configure-fontforge.h | |
17 | include/fontforge/delta.h | 17 | include/fontforge/delta.h | |
18 | include/fontforge/dynamic.h | 18 | include/fontforge/dynamic.h | |
19 | include/fontforge/edgelist.h | 19 | include/fontforge/edgelist.h | |
20 | include/fontforge/edgelist2.h | 20 | include/fontforge/edgelist2.h | |
21 | include/fontforge/encoding.h | 21 | include/fontforge/encoding.h | |
22 | include/fontforge/fffreetype.h | 22 | include/fontforge/fffreetype.h | |
23 | include/fontforge/ffpython.h | 23 | include/fontforge/ffpython.h | |
24 | include/fontforge/fileutil.h | 24 | include/fontforge/fileutil.h | |
25 | include/fontforge/fontforge.h | |||
25 | include/fontforge/fontforgevw.h | 26 | include/fontforge/fontforgevw.h | |
26 | include/fontforge/fvmetrics.h | 27 | include/fontforge/fvmetrics.h | |
27 | include/fontforge/gdraw.h | 28 | include/fontforge/gdraw.h | |
28 | include/fontforge/gfile.h | 29 | include/fontforge/gfile.h | |
29 | include/fontforge/ggadget.h | 30 | include/fontforge/ggadget.h | |
30 | include/fontforge/gicons.h | 31 | include/fontforge/gicons.h | |
31 | include/fontforge/gimage.h | 32 | include/fontforge/gimage.h | |
32 | include/fontforge/gio.h | 33 | include/fontforge/gio.h | |
33 | include/fontforge/gkeysym.h | 34 | include/fontforge/gkeysym.h | |
34 | include/fontforge/gprogress.h | 35 | include/fontforge/gprogress.h | |
35 | include/fontforge/gresedit.h | 36 | include/fontforge/gresedit.h | |
36 | include/fontforge/gresource.h | 37 | include/fontforge/gresource.h | |
37 | include/fontforge/groups.h | 38 | include/fontforge/groups.h | |
38 | include/fontforge/gwidget.h | 39 | include/fontforge/gwidget.h | |
39 | include/fontforge/gwwiconv.h | 40 | include/fontforge/gwwiconv.h | |
40 | include/fontforge/import.h | 41 | include/fontforge/import.h | |
41 | include/fontforge/intl.h | 42 | include/fontforge/intl.h | |
42 | include/fontforge/libffstamp.h | 43 | include/fontforge/libffstamp.h | |
43 | include/fontforge/lookups.h | 44 | include/fontforge/lookups.h | |
44 | include/fontforge/mm.h | 45 | include/fontforge/mm.h | |
45 | include/fontforge/namehash.h | 46 | include/fontforge/namehash.h | |
46 | include/fontforge/nonlineartrans.h | 47 | include/fontforge/nonlineartrans.h | |
47 | include/fontforge/ofl.h | 48 | include/fontforge/ofl.h | |
48 | include/fontforge/pfaedit.h | |||
49 | include/fontforge/plugins.h | 49 | include/fontforge/plugins.h | |
50 | include/fontforge/print.h | 50 | include/fontforge/print.h | |
51 | include/fontforge/psfont.h | 51 | include/fontforge/psfont.h | |
52 | include/fontforge/savefont.h | 52 | include/fontforge/savefont.h | |
53 | include/fontforge/scriptfuncs.h | 53 | include/fontforge/scriptfuncs.h | |
54 | include/fontforge/scripting.h | 54 | include/fontforge/scripting.h | |
55 | include/fontforge/sd.h | 55 | include/fontforge/sd.h | |
56 | include/fontforge/search.h | 56 | include/fontforge/search.h | |
57 | include/fontforge/sfd1.h | 57 | include/fontforge/sfd1.h | |
58 | include/fontforge/sflayoutP.h | 58 | include/fontforge/sflayoutP.h | |
59 | include/fontforge/splinefont.h | 59 | include/fontforge/splinefont.h | |
60 | include/fontforge/stemdb.h | 60 | include/fontforge/stemdb.h | |
61 | include/fontforge/ttf.h | 61 | include/fontforge/ttf.h | |
@@ -237,20 +237,20 @@ share/fontforge/pixmaps/viewprev.png | @@ -237,20 +237,20 @@ share/fontforge/pixmaps/viewprev.png | |||
237 | share/fontforge/pixmaps/viewprevdef.png | 237 | share/fontforge/pixmaps/viewprevdef.png | |
238 | share/fontforge/pixmaps/viewreplace.png | 238 | share/fontforge/pixmaps/viewreplace.png | |
239 | share/fontforge/pixmaps/viewsmallersize.png | 239 | share/fontforge/pixmaps/viewsmallersize.png | |
240 | share/fontforge/pixmaps/viewzoomin.png | 240 | share/fontforge/pixmaps/viewzoomin.png | |
241 | share/fontforge/pixmaps/viewzoomout.png | 241 | share/fontforge/pixmaps/viewzoomout.png | |
242 | share/fontforge/python/excepthook.py | 242 | share/fontforge/python/excepthook.py | |
243 | share/locale/de/LC_MESSAGES/FontForge.mo | 243 | share/locale/de/LC_MESSAGES/FontForge.mo | |
244 | share/locale/el/LC_MESSAGES/FontForge.mo | 244 | share/locale/el/LC_MESSAGES/FontForge.mo | |
245 | share/locale/en_GB/LC_MESSAGES/FontForge.mo | 245 | share/locale/en_GB/LC_MESSAGES/FontForge.mo | |
246 | share/locale/es/LC_MESSAGES/FontForge.mo | 246 | share/locale/es/LC_MESSAGES/FontForge.mo | |
247 | share/locale/fr/LC_MESSAGES/FontForge.mo | 247 | share/locale/fr/LC_MESSAGES/FontForge.mo | |
248 | share/locale/it/LC_MESSAGES/FontForge.mo | 248 | share/locale/it/LC_MESSAGES/FontForge.mo | |
249 | share/locale/ja/LC_MESSAGES/FontForge.mo | 249 | share/locale/ja/LC_MESSAGES/FontForge.mo | |
250 | share/locale/mal/LC_MESSAGES/FontForge.mo | 250 | share/locale/ml/LC_MESSAGES/FontForge.mo | |
251 | share/locale/pl/LC_MESSAGES/FontForge.mo | 251 | share/locale/pl/LC_MESSAGES/FontForge.mo | |
252 | share/locale/ru/LC_MESSAGES/FontForge.mo | 252 | share/locale/ru/LC_MESSAGES/FontForge.mo | |
253 | share/locale/uk/LC_MESSAGES/FontForge.mo | 253 | share/locale/uk/LC_MESSAGES/FontForge.mo | |
254 | share/locale/vi/LC_MESSAGES/FontForge.mo | 254 | share/locale/vi/LC_MESSAGES/FontForge.mo | |
255 | share/locale/zh_CN/LC_MESSAGES/FontForge.mo | 255 | share/locale/zh_CN/LC_MESSAGES/FontForge.mo | |
256 | share/locale/zh_TW/LC_MESSAGES/FontForge.mo | 256 | share/locale/zh_TW/LC_MESSAGES/FontForge.mo |
@@ -1,12 +1,8 @@ | @@ -1,12 +1,8 @@ | |||
1 | $NetBSD: distinfo,v 1.57 2011/01/24 12:08:26 wiz Exp $ | 1 | $NetBSD: distinfo,v 1.58 2011/05/02 11:15:42 adam Exp $ | |
2 | 2 | |||
3 | SHA1 (fontforge_full-20100501.tar.bz2) = 483425116c6af6ad90e37f9ada0c28e34f251ec3 | 3 | SHA1 (fontforge_full-20110222.tar.bz2) = 8fada07647f102351bb1d7d1c4da487356e7142f | |
4 | RMD160 (fontforge_full-20100501.tar.bz2) = 4dee2ecdbd32bf3854105f195984d9cabf198fd8 | 4 | RMD160 (fontforge_full-20110222.tar.bz2) = 7f276e9e3ef673b78355bb7be50f6b2587aee633 | |
5 | Size (fontforge_full-20100501.tar.bz2) = 6666386 bytes | 5 | Size (fontforge_full-20110222.tar.bz2) = 5126031 bytes | |
6 | SHA1 (patch-aa) = e6846a21c973aaa265bb46ba63d145d5f9c00714 | 6 | SHA1 (patch-aa) = 9b94b0dccc3006112dae8289ed81c5aaba262576 | |
7 | SHA1 (patch-ab) = ec93a47051186bcb901fd145edffad7c457c33fd | 7 | SHA1 (patch-ab) = ec93a47051186bcb901fd145edffad7c457c33fd | |
8 | SHA1 (patch-ae) = ca532490137e83ff328ad32c0102d57bed7bb453 | 8 | SHA1 (patch-ae) = 2cffc4dad365ff3f7850c1982bbe27bc9821f792 | |
9 | SHA1 (patch-ai) = 4b30556509007d1c74ccdfc9d27f7f23f30bbdb1 | |||
10 | SHA1 (patch-aj) = 751baf7cdaf3c74632a95389611366134fe36da5 | |||
11 | SHA1 (patch-ak) = a69ec30586d61b89896758d5a1e817d917a835d2 | |||
12 | SHA1 (patch-al) = f34104791646030bb76df20e5ddb88bf21842b02 |
@@ -1,22 +1,22 @@ | @@ -1,22 +1,22 @@ | |||
1 | $NetBSD: patch-aa,v 1.9 2010/05/21 06:34:23 adam Exp $ | 1 | $NetBSD: patch-aa,v 1.10 2011/05/02 11:15:42 adam Exp $ | |
2 | 2 | |||
3 | --- fontforge/Makefile.dynamic.in.orig 2010-02-02 05:23:06.000000000 +0000 | 3 | --- fontforge/Makefile.dynamic.in.orig 2010-02-02 05:23:06.000000000 +0000 | |
4 | +++ fontforge/Makefile.dynamic.in | 4 | +++ fontforge/Makefile.dynamic.in | |
5 | @@ -15,7 +15,7 @@ CC = @CC@ | 5 | @@ -15,7 +15,7 @@ CC = @CC@ | |
6 | O = @O_EXTENSION@ | 6 | O = @O_EXTENSION@ | |
7 | 7 | |||
8 | X_CFLAGS = @X_CFLAGS@ | 8 | X_CFLAGS = @X_CFLAGS@ | |
9 | -X_LIBS = @X_LIBS@ | 9 | -X_LIBS = @X_LIBS@ | |
10 | +X_LIBS = @X_LIBS@ -Wl,-R${X11BASE}/lib | 10 | +X_LIBS = @X_LIBS@ -Wl,-R${X11BASE}/lib | |
11 | X_11LIB = @X_11LIB@ | 11 | X_11LIB = @X_11LIB@ | |
12 | X_EXTRA_LIBS = @X_EXTRA_LIBS@ | 12 | X_EXTRA_LIBS = @X_EXTRA_LIBS@ | |
13 | X_PRE_LIBS = @X_PRE_LIBS@ | 13 | X_PRE_LIBS = @X_PRE_LIBS@ | |
14 | @@ -74,7 +74,7 @@ LIBLIBS = -rpath $(libdir) ../libgutils. | 14 | @@ -75,7 +75,7 @@ LIBLIBS = -rpath $(libdir) ../libgutils. | |
15 | @LIBS@ $(STATIC_LIBS) -lm | 15 | @LIBS@ $(STATIC_LIBS) -lm | |
16 | DLIBS = -rpath $(libdir) ../libfontforge.la ../libgutils.la ../libgunicode.la @LIBS@ $(STATIC_LIBS) -lm | 16 | DLIBS = -rpath $(libdir) ../libfontforge.la ../libgutils.la ../libgunicode.la @LIBS@ $(STATIC_LIBS) -lm | |
17 | 17 | |||
18 | -all: @FINAL_TARGET@ @MACAPP@ sfddiff fontimage fontlint | 18 | -all: @FINAL_TARGET@ @MACAPP@ sfddiff fontimage fontlint | |
19 | +all: @FINAL_TARGET@ sfddiff fontimage fontlint | 19 | +all: @FINAL_TARGET@ sfddiff fontimage fontlint | |
20 | 20 | |||
21 | fontforge: $(@exeOBJECTS@) $(fontforge_LIBOBJECTS) exelibstamp.pre libstamp.pre | 21 | fontforge: $(@exeOBJECTS@) $(fontforge_LIBOBJECTS) exelibstamp.pre libstamp.pre | |
22 | sed -e '1,$$ s/REPLACE_ME_WITH_MAJOR_VERSION/$(FF_VERSION)/' -e '1,$$ s/REPLACE_ME_WITH_MINOR_VERSION/$(FF_REVISION)/' < exelibstamp.pre > exelibstamp.c | 22 | sed -e '1,$$ s/REPLACE_ME_WITH_MAJOR_VERSION/$(FF_VERSION)/' -e '1,$$ s/REPLACE_ME_WITH_MINOR_VERSION/$(FF_REVISION)/' < exelibstamp.pre > exelibstamp.c |
@@ -1,14 +1,14 @@ | @@ -1,14 +1,14 @@ | |||
1 | $NetBSD: patch-ae,v 1.22 2010/05/21 06:34:23 adam Exp $ | 1 | $NetBSD: patch-ae,v 1.23 2011/05/02 11:15:42 adam Exp $ | |
2 | 2 | |||
3 | --- configure.orig 2010-04-29 17:53:45.000000000 +0000 | 3 | --- configure.orig 2010-04-29 17:53:45.000000000 +0000 | |
4 | +++ configure | 4 | +++ configure | |
5 | @@ -20275,14 +20275,14 @@ if test "x$ac_cv_file__usr_include_libxm | 5 | @@ -20275,14 +20275,14 @@ if test "x$ac_cv_file__usr_include_libxm | |
6 | CFLAGS="$CFLAGS -I/usr/include/libxml2/" | 6 | CFLAGS="$CFLAGS -I/usr/include/libxml2/" | |
7 | else | 7 | else | |
8 | 8 | |||
9 | - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /usr/local/include/libxml2/libxml" >&5 | 9 | - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /usr/local/include/libxml2/libxml" >&5 | |
10 | -$as_echo_n "checking for /usr/local/include/libxml2/libxml... " >&6; } | 10 | -$as_echo_n "checking for /usr/local/include/libxml2/libxml... " >&6; } | |
11 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${PREFIX}/include/libxml2/libxml" >&5 | 11 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${PREFIX}/include/libxml2/libxml" >&5 | |
12 | +$as_echo_n "checking for ${PREFIX}/include/libxml2/libxml... " >&6; } | 12 | +$as_echo_n "checking for ${PREFIX}/include/libxml2/libxml... " >&6; } | |
13 | if test "${ac_cv_file__usr_local_include_libxml2_libxml+set}" = set; then : | 13 | if test "${ac_cv_file__usr_local_include_libxml2_libxml+set}" = set; then : | |
14 | $as_echo_n "(cached) " >&6 | 14 | $as_echo_n "(cached) " >&6 | |
@@ -19,22 +19,22 @@ $NetBSD: patch-ae,v 1.22 2010/05/21 06:3 | @@ -19,22 +19,22 @@ $NetBSD: patch-ae,v 1.22 2010/05/21 06:3 | |||
19 | +if test -r "${PREFIX}/include/libxml2/libxml"; then | 19 | +if test -r "${PREFIX}/include/libxml2/libxml"; then | |
20 | ac_cv_file__usr_local_include_libxml2_libxml=yes | 20 | ac_cv_file__usr_local_include_libxml2_libxml=yes | |
21 | else | 21 | else | |
22 | ac_cv_file__usr_local_include_libxml2_libxml=no | 22 | ac_cv_file__usr_local_include_libxml2_libxml=no | |
23 | @@ -20291,7 +20291,7 @@ fi | 23 | @@ -20291,7 +20291,7 @@ fi | |
24 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__usr_local_include_libxml2_libxml" >&5 | 24 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__usr_local_include_libxml2_libxml" >&5 | |
25 | $as_echo "$ac_cv_file__usr_local_include_libxml2_libxml" >&6; } | 25 | $as_echo "$ac_cv_file__usr_local_include_libxml2_libxml" >&6; } | |
26 | if test "x$ac_cv_file__usr_local_include_libxml2_libxml" = x""yes; then : | 26 | if test "x$ac_cv_file__usr_local_include_libxml2_libxml" = x""yes; then : | |
27 | - CFLAGS="$CFLAGS -I/usr/local/include -I/usr/local/include/libxml2/" | 27 | - CFLAGS="$CFLAGS -I/usr/local/include -I/usr/local/include/libxml2/" | |
28 | + CFLAGS="$CFLAGS -I${PREFIX}/include -I${PREFIX}/include/libxml2/" | 28 | + CFLAGS="$CFLAGS -I${PREFIX}/include -I${PREFIX}/include/libxml2/" | |
29 | else | 29 | else | |
30 | $as_echo "#define _NO_LIBXML 1" >>confdefs.h | 30 | $as_echo "#define _NO_LIBXML 1" >>confdefs.h | |
31 | 31 | |||
32 | @@ -22930,7 +22930,7 @@ if test "$gww_has_gettext" = "yes" >/dev | 32 | @@ -23016,7 +23016,7 @@ if test "$gww_has_gettext" = "yes" >/dev | |
33 | 33 | |||
34 | cat </dev/null >$ac_confdir/po/Makefile.in | 34 | cat </dev/null >$ac_confdir/po/Makefile.in | |
35 | echo 'prefix = @prefix@' >> $ac_confdir/po/Makefile.in | 35 | echo 'prefix = @prefix@' >> $ac_confdir/po/Makefile.in | |
36 | - echo 'localedir = $(prefix)/share/locale' >> $ac_confdir/po/Makefile.in | 36 | - echo 'localedir = $(prefix)/share/locale' >> $ac_confdir/po/Makefile.in | |
37 | + echo 'localedir = ${PREFIX}/${PKGLOCALEDIR}/locale' >> $ac_confdir/po/Makefile.in | 37 | + echo 'localedir = ${PREFIX}/${PKGLOCALEDIR}/locale' >> $ac_confdir/po/Makefile.in | |
38 | echo 'INSTALL = @INSTALL@' >> $ac_confdir/po/Makefile.in | 38 | echo 'INSTALL = @INSTALL@' >> $ac_confdir/po/Makefile.in | |
39 | echo 'INSTALL_DATA = @INSTALL_DATA@' >> $ac_confdir/po/Makefile.in | 39 | echo 'INSTALL_DATA = @INSTALL_DATA@' >> $ac_confdir/po/Makefile.in | |
40 | echo '' >> $ac_confdir/po/Makefile.in | 40 | echo '' >> $ac_confdir/po/Makefile.in |