Use "PKGLOCALEDIR" instead of "LOCALEDIR".

4 files changed, 37 insertions, 39 deletions

diff --git a/devel/gettext/Makefile b/devel/gettext/Makefile
index 25b37a7d96c..5ecd717b4f1 100644
--- a/devel/gettext/Makefile
+++ b/devel/gettext/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2001/02/16 14:38:25 wiz Exp $
+# $NetBSD: Makefile,v 1.28 2001/02/26 20:19:43 tron Exp $
 # FreeBSD Id: Makefile,v 1.1.1.1 1998/08/09 15:13:33 kuriyama Exp
 #
 
@@ -19,7 +19,7 @@ CONFIGURE_ENV+=		LIBS="-L${LOCALBASE}/lib" \
 			CPPFLAGS="-I${LOCALBASE}/include"
 
 INFO_FILES=		gettext.info
-PLIST_SUBST+=		LOCALEDIR=${LOCALEDIR}
+
 post-patch:
 	${RM} -f ${WRKSRC}/intl/libgettext.h
 	${RM} -f ${WRKSRC}/intl/libintl.h
diff --git a/devel/gettext/pkg/PLIST b/devel/gettext/pkg/PLIST
index af48d7de31c..f889e2ea69d 100644
--- a/devel/gettext/pkg/PLIST
+++ b/devel/gettext/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.14 2001/02/13 11:47:00 tron Exp $
+@comment $NetBSD: PLIST,v 1.15 2001/02/26 20:19:44 tron Exp $
 bin/gettext
 bin/gettextize
 bin/msgcmp
@@ -44,18 +44,18 @@ share/gettext/intl/textdomain.c
 share/gettext/intl/xopen-msg.sed
 share/gettext/po/Makefile.in.in
 share/locale/locale.alias
-${LOCALEDIR}/locale/da/LC_MESSAGES/gettext.mo
-${LOCALEDIR}/locale/de/LC_MESSAGES/gettext.mo
-${LOCALEDIR}/locale/es/LC_MESSAGES/gettext.mo
-${LOCALEDIR}/locale/fr/LC_MESSAGES/gettext.mo
-${LOCALEDIR}/locale/ko/LC_MESSAGES/gettext.mo
-${LOCALEDIR}/locale/nl/LC_MESSAGES/gettext.mo
-${LOCALEDIR}/locale/no/LC_MESSAGES/gettext.mo
-${LOCALEDIR}/locale/no@nynorsk/LC_MESSAGES/gettext.mo
-${LOCALEDIR}/locale/pl/LC_MESSAGES/gettext.mo
-${LOCALEDIR}/locale/pt/LC_MESSAGES/gettext.mo
-${LOCALEDIR}/locale/sl/LC_MESSAGES/gettext.mo
-${LOCALEDIR}/locale/sv/LC_MESSAGES/gettext.mo
+${PKGLOCALEDIR}/locale/da/LC_MESSAGES/gettext.mo
+${PKGLOCALEDIR}/locale/de/LC_MESSAGES/gettext.mo
+${PKGLOCALEDIR}/locale/es/LC_MESSAGES/gettext.mo
+${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/gettext.mo
+${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/gettext.mo
+${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/gettext.mo
+${PKGLOCALEDIR}/locale/no/LC_MESSAGES/gettext.mo
+${PKGLOCALEDIR}/locale/no@nynorsk/LC_MESSAGES/gettext.mo
+${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/gettext.mo
+${PKGLOCALEDIR}/locale/pt/LC_MESSAGES/gettext.mo
+${PKGLOCALEDIR}/locale/sl/LC_MESSAGES/gettext.mo
+${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/gettext.mo
 @dirrm share/gettext/po
 @dirrm share/gettext/intl
 @dirrm share/gettext
diff --git a/devel/glade/Makefile b/devel/glade/Makefile
index 21ae4442f6d..8cfe3916d30 100644
--- a/devel/glade/Makefile
+++ b/devel/glade/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2001/02/25 04:17:41 hubertf Exp $
+# $NetBSD: Makefile,v 1.22 2001/02/26 20:19:44 tron Exp $
 # FreeBSD Id: Makefile,v 1.10 1998/11/18 17:35:16 vanilla Exp
 #
 
@@ -19,8 +19,6 @@ USE_X11BASE=	yes
 CONFIGURE_ENV+=	CFLAGS="${CFLAGS} -I${LOCALBASE}/include"
 CONFIGURE_ENV+=	LOCALEDIR=${LOCALEDIR}
 
-PLIST_SUBST+=	LOCALEDIR=${LOCALEDIR}
-
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/glade
 	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/glade
diff --git a/devel/glade/pkg/PLIST b/devel/glade/pkg/PLIST
index d7e00bfab40..2ee77682596 100644
--- a/devel/glade/pkg/PLIST
+++ b/devel/glade/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2001/02/13 11:47:00 tron Exp $
+@comment $NetBSD: PLIST,v 1.9 2001/02/26 20:19:44 tron Exp $
 bin/glade
 share/doc/glade/README
 share/doc/glade/TODO
@@ -9,26 +9,26 @@ share/doc/glade/manual.txt
 share/doc/glade/notes.txt
 share/doc/glade/portability.txt
 share/doc/glade/source_code.txt
-${LOCALEDIR}/locale/da/LC_MESSAGES/glade.mo
-${LOCALEDIR}/locale/de/LC_MESSAGES/glade.mo
-${LOCALEDIR}/locale/en_GB/LC_MESSAGES/glade.mo
-${LOCALEDIR}/locale/es/LC_MESSAGES/glade.mo
-${LOCALEDIR}/locale/fr/LC_MESSAGES/glade.mo
-${LOCALEDIR}/locale/it/LC_MESSAGES/glade.mo
-${LOCALEDIR}/locale/ja/LC_MESSAGES/glade.mo
-${LOCALEDIR}/locale/ko/LC_MESSAGES/glade.mo
-${LOCALEDIR}/locale/no/LC_MESSAGES/glade.mo
-${LOCALEDIR}/locale/pl/LC_MESSAGES/glade.mo
-${LOCALEDIR}/locale/ru/LC_MESSAGES/glade.mo
-${LOCALEDIR}/locale/ca/LC_MESSAGES/glade.mo
-${LOCALEDIR}/locale/cs/LC_MESSAGES/glade.mo
-${LOCALEDIR}/locale/el/LC_MESSAGES/glade.mo
-${LOCALEDIR}/locale/ga/LC_MESSAGES/glade.mo
-${LOCALEDIR}/locale/sv/LC_MESSAGES/glade.mo
-${LOCALEDIR}/locale/uk/LC_MESSAGES/glade.mo
-${LOCALEDIR}/locale/gl/LC_MESSAGES/glade.mo
-${LOCALEDIR}/locale/pt_BR/LC_MESSAGES/glade.mo
-${LOCALEDIR}/locale/tr/LC_MESSAGES/glade.mo
+${PKGLOCALEDIR}/locale/da/LC_MESSAGES/glade.mo
+${PKGLOCALEDIR}/locale/de/LC_MESSAGES/glade.mo
+${PKGLOCALEDIR}/locale/en_GB/LC_MESSAGES/glade.mo
+${PKGLOCALEDIR}/locale/es/LC_MESSAGES/glade.mo
+${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/glade.mo
+${PKGLOCALEDIR}/locale/it/LC_MESSAGES/glade.mo
+${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/glade.mo
+${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/glade.mo
+${PKGLOCALEDIR}/locale/no/LC_MESSAGES/glade.mo
+${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/glade.mo
+${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/glade.mo
+${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/glade.mo
+${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/glade.mo
+${PKGLOCALEDIR}/locale/el/LC_MESSAGES/glade.mo
+${PKGLOCALEDIR}/locale/ga/LC_MESSAGES/glade.mo
+${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/glade.mo
+${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/glade.mo
+${PKGLOCALEDIR}/locale/gl/LC_MESSAGES/glade.mo
+${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/glade.mo
+${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/glade.mo
 share/gnome/apps/Development/glade.desktop
 share/gnome/help/glade/C/topic.dat
 share/gnome/help/glade/C/user-guide/user-guide-images/edit-menu.png