Use "PKGLOCALEDIR" instead of "LOCALEDIR".

4 files changed, 66 insertions, 70 deletions

diff --git a/misc/gnome-pim/Makefile b/misc/gnome-pim/Makefile
index aa8401744e0..fb059fbc8f8 100644
--- a/misc/gnome-pim/Makefile
+++ b/misc/gnome-pim/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2001/02/17 18:09:03 wiz Exp $
+# $NetBSD: Makefile,v 1.25 2001/02/26 20:19:46 tron Exp $
 #
 
 DISTNAME=		gnome-pim-1.2.0
@@ -22,8 +22,6 @@ GNU_CONFIGURE=		# defined
 CONFIGURE_ENV+=		CPPFLAGS="-I${LOCALBASE}/include" \
 			LOCALEDIR=${LOCALEDIR}
 
-PLIST_SUBST+=		LOCALEDIR=${LOCALEDIR}
-
 AUTOGEN_ENV=		NOCONFIGURE=1
 AUTOGEN_ENV+=		srcdir=${WRKSRC}
 
diff --git a/misc/gnome-pim/pkg/PLIST b/misc/gnome-pim/pkg/PLIST
index 45b1a26b5a7..ae0fe0a0bc3 100644
--- a/misc/gnome-pim/pkg/PLIST
+++ b/misc/gnome-pim/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2001/02/13 11:47:03 tron Exp $
+@comment $NetBSD: PLIST,v 1.10 2001/02/26 20:19:47 tron Exp $
 bin/gnomecal
 bin/gnomecard
 etc/CORBA/servers/gnomecal.gnorba
@@ -25,38 +25,38 @@ share/gnome/help/gnomecal/C/gcal.html
 share/gnome/help/gnomecal/C/ln20.html
 share/gnome/help/gnomecal/C/tech.html.html
 share/gnome/help/gnomecal/C/docbook.css
-${LOCALEDIR}/locale/ca/LC_MESSAGES/gnome-pim.mo
-${LOCALEDIR}/locale/cs/LC_MESSAGES/gnome-pim.mo
-${LOCALEDIR}/locale/cy/LC_MESSAGES/gnome-pim.mo
-${LOCALEDIR}/locale/da/LC_MESSAGES/gnome-pim.mo
-${LOCALEDIR}/locale/de/LC_MESSAGES/gnome-pim.mo
-${LOCALEDIR}/locale/el/LC_MESSAGES/gnome-pim.mo
-${LOCALEDIR}/locale/en_GB/LC_MESSAGES/gnome-pim.mo
-${LOCALEDIR}/locale/es/LC_MESSAGES/gnome-pim.mo
-${LOCALEDIR}/locale/et/LC_MESSAGES/gnome-pim.mo
-${LOCALEDIR}/locale/fi/LC_MESSAGES/gnome-pim.mo
-${LOCALEDIR}/locale/fr/LC_MESSAGES/gnome-pim.mo
-${LOCALEDIR}/locale/ga/LC_MESSAGES/gnome-pim.mo
-${LOCALEDIR}/locale/gd/LC_MESSAGES/gnome-pim.mo
-${LOCALEDIR}/locale/gl/LC_MESSAGES/gnome-pim.mo
-${LOCALEDIR}/locale/gv/LC_MESSAGES/gnome-pim.mo
-${LOCALEDIR}/locale/hu/LC_MESSAGES/gnome-pim.mo
-${LOCALEDIR}/locale/it/LC_MESSAGES/gnome-pim.mo
-${LOCALEDIR}/locale/ja/LC_MESSAGES/gnome-pim.mo
-${LOCALEDIR}/locale/ko/LC_MESSAGES/gnome-pim.mo
-${LOCALEDIR}/locale/kw/LC_MESSAGES/gnome-pim.mo
-${LOCALEDIR}/locale/lt/LC_MESSAGES/gnome-pim.mo
-${LOCALEDIR}/locale/nl/LC_MESSAGES/gnome-pim.mo
-${LOCALEDIR}/locale/no/LC_MESSAGES/gnome-pim.mo
-${LOCALEDIR}/locale/pl/LC_MESSAGES/gnome-pim.mo
-${LOCALEDIR}/locale/pt/LC_MESSAGES/gnome-pim.mo
-${LOCALEDIR}/locale/pt_BR/LC_MESSAGES/gnome-pim.mo
-${LOCALEDIR}/locale/ru/LC_MESSAGES/gnome-pim.mo
-${LOCALEDIR}/locale/sv/LC_MESSAGES/gnome-pim.mo
-${LOCALEDIR}/locale/uk/LC_MESSAGES/gnome-pim.mo
-${LOCALEDIR}/locale/wa/LC_MESSAGES/gnome-pim.mo
-${LOCALEDIR}/locale/zh_TW.Big5/LC_MESSAGES/gnome-pim.mo
-${LOCALEDIR}/locale/zh_CN.GB2312/LC_MESSAGES/gnome-pim.mo
+${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/gnome-pim.mo
+${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/gnome-pim.mo
+${PKGLOCALEDIR}/locale/cy/LC_MESSAGES/gnome-pim.mo
+${PKGLOCALEDIR}/locale/da/LC_MESSAGES/gnome-pim.mo
+${PKGLOCALEDIR}/locale/de/LC_MESSAGES/gnome-pim.mo
+${PKGLOCALEDIR}/locale/el/LC_MESSAGES/gnome-pim.mo
+${PKGLOCALEDIR}/locale/en_GB/LC_MESSAGES/gnome-pim.mo
+${PKGLOCALEDIR}/locale/es/LC_MESSAGES/gnome-pim.mo
+${PKGLOCALEDIR}/locale/et/LC_MESSAGES/gnome-pim.mo
+${PKGLOCALEDIR}/locale/fi/LC_MESSAGES/gnome-pim.mo
+${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/gnome-pim.mo
+${PKGLOCALEDIR}/locale/ga/LC_MESSAGES/gnome-pim.mo
+${PKGLOCALEDIR}/locale/gd/LC_MESSAGES/gnome-pim.mo
+${PKGLOCALEDIR}/locale/gl/LC_MESSAGES/gnome-pim.mo
+${PKGLOCALEDIR}/locale/gv/LC_MESSAGES/gnome-pim.mo
+${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/gnome-pim.mo
+${PKGLOCALEDIR}/locale/it/LC_MESSAGES/gnome-pim.mo
+${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/gnome-pim.mo
+${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/gnome-pim.mo
+${PKGLOCALEDIR}/locale/kw/LC_MESSAGES/gnome-pim.mo
+${PKGLOCALEDIR}/locale/lt/LC_MESSAGES/gnome-pim.mo
+${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/gnome-pim.mo
+${PKGLOCALEDIR}/locale/no/LC_MESSAGES/gnome-pim.mo
+${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/gnome-pim.mo
+${PKGLOCALEDIR}/locale/pt/LC_MESSAGES/gnome-pim.mo
+${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/gnome-pim.mo
+${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/gnome-pim.mo
+${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/gnome-pim.mo
+${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/gnome-pim.mo
+${PKGLOCALEDIR}/locale/wa/LC_MESSAGES/gnome-pim.mo
+${PKGLOCALEDIR}/locale/zh_TW.Big5/LC_MESSAGES/gnome-pim.mo
+${PKGLOCALEDIR}/locale/zh_CN.GB2312/LC_MESSAGES/gnome-pim.mo
 @dirrm share/gnome/help/gnomecal/C/images
 @dirrm share/gnome/help/gnomecal/C
 @dirrm share/gnome/help/gnomecal
diff --git a/misc/gnome-utils/Makefile b/misc/gnome-utils/Makefile
index 2e8c1c40e09..b417f8d1131 100644
--- a/misc/gnome-utils/Makefile
+++ b/misc/gnome-utils/Makefile
@@ -1,4 +1,4 @@
-## $NetBSD: Makefile,v 1.30 2001/02/17 18:09:04 wiz Exp $
+## $NetBSD: Makefile,v 1.31 2001/02/26 20:19:47 tron Exp $
 
 DISTNAME=		gnome-utils-1.2.0
 CATEGORIES=		misc x11 gnome
@@ -23,8 +23,6 @@ USE_X11BASE=		# defined
 GNU_CONFIGURE=		# defined
 CONFIGURE_ENV+=		LOCALEDIR=${LOCALEDIR}
 
-PLIST_SUBST+=		LOCALEDIR=${LOCALEDIR}
-
 AUTOGEN_ENV=		NOCONFIGURE=1
 AUTOGEN_ENV+=		srcdir=${WRKSRC}
 
diff --git a/misc/gnome-utils/pkg/PLIST b/misc/gnome-utils/pkg/PLIST
index cb50c1772a5..fe4e6472ba7 100644
--- a/misc/gnome-utils/pkg/PLIST
+++ b/misc/gnome-utils/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2001/02/13 11:47:04 tron Exp $
+@comment $NetBSD: PLIST,v 1.10 2001/02/26 20:19:47 tron Exp $
 bin/gcalc
 bin/gcharmap
 bin/gcolorsel
@@ -184,36 +184,36 @@ share/gcolorsel/glade/view-color-grid-properties.glade.h
 share/gcolorsel/glade/view-color-list-properties.glade
 share/gcolorsel/glade/view-color-list-properties.glade.h
 share/idl/gsu.idl
-${LOCALEDIR}/locale/ca/LC_MESSAGES/gnome-utils.mo
-${LOCALEDIR}/locale/cs/LC_MESSAGES/gnome-utils.mo
-${LOCALEDIR}/locale/da/LC_MESSAGES/gnome-utils.mo
-${LOCALEDIR}/locale/de/LC_MESSAGES/gnome-utils.mo
-${LOCALEDIR}/locale/el/LC_MESSAGES/gnome-utils.mo
-${LOCALEDIR}/locale/en_GB/LC_MESSAGES/gnome-utils.mo
-${LOCALEDIR}/locale/es/LC_MESSAGES/gnome-utils.mo
-${LOCALEDIR}/locale/et/LC_MESSAGES/gnome-utils.mo
-${LOCALEDIR}/locale/fi/LC_MESSAGES/gnome-utils.mo
-${LOCALEDIR}/locale/fr/LC_MESSAGES/gnome-utils.mo
-${LOCALEDIR}/locale/ga/LC_MESSAGES/gnome-utils.mo
-${LOCALEDIR}/locale/gl/LC_MESSAGES/gnome-utils.mo
-${LOCALEDIR}/locale/hu/LC_MESSAGES/gnome-utils.mo
-${LOCALEDIR}/locale/it/LC_MESSAGES/gnome-utils.mo
-${LOCALEDIR}/locale/ja/LC_MESSAGES/gnome-utils.mo
-${LOCALEDIR}/locale/ko/LC_MESSAGES/gnome-utils.mo
-${LOCALEDIR}/locale/lt/LC_MESSAGES/gnome-utils.mo
-${LOCALEDIR}/locale/nl/LC_MESSAGES/gnome-utils.mo
-${LOCALEDIR}/locale/no/LC_MESSAGES/gnome-utils.mo
-${LOCALEDIR}/locale/pl/LC_MESSAGES/gnome-utils.mo
-${LOCALEDIR}/locale/pt/LC_MESSAGES/gnome-utils.mo
-${LOCALEDIR}/locale/pt_BR/LC_MESSAGES/gnome-utils.mo
-${LOCALEDIR}/locale/ro/LC_MESSAGES/gnome-utils.mo
-${LOCALEDIR}/locale/ru/LC_MESSAGES/gnome-utils.mo
-${LOCALEDIR}/locale/sv/LC_MESSAGES/gnome-utils.mo
-${LOCALEDIR}/locale/tr/LC_MESSAGES/gnome-utils.mo
-${LOCALEDIR}/locale/uk/LC_MESSAGES/gnome-utils.mo
-${LOCALEDIR}/locale/wa/LC_MESSAGES/gnome-utils.mo
-${LOCALEDIR}/locale/zh_TW.Big5/LC_MESSAGES/gnome-utils.mo
-${LOCALEDIR}/locale/zh_CN.GB2312/LC_MESSAGES/gnome-utils.mo
+${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/gnome-utils.mo
+${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/gnome-utils.mo
+${PKGLOCALEDIR}/locale/da/LC_MESSAGES/gnome-utils.mo
+${PKGLOCALEDIR}/locale/de/LC_MESSAGES/gnome-utils.mo
+${PKGLOCALEDIR}/locale/el/LC_MESSAGES/gnome-utils.mo
+${PKGLOCALEDIR}/locale/en_GB/LC_MESSAGES/gnome-utils.mo
+${PKGLOCALEDIR}/locale/es/LC_MESSAGES/gnome-utils.mo
+${PKGLOCALEDIR}/locale/et/LC_MESSAGES/gnome-utils.mo
+${PKGLOCALEDIR}/locale/fi/LC_MESSAGES/gnome-utils.mo
+${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/gnome-utils.mo
+${PKGLOCALEDIR}/locale/ga/LC_MESSAGES/gnome-utils.mo
+${PKGLOCALEDIR}/locale/gl/LC_MESSAGES/gnome-utils.mo
+${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/gnome-utils.mo
+${PKGLOCALEDIR}/locale/it/LC_MESSAGES/gnome-utils.mo
+${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/gnome-utils.mo
+${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/gnome-utils.mo
+${PKGLOCALEDIR}/locale/lt/LC_MESSAGES/gnome-utils.mo
+${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/gnome-utils.mo
+${PKGLOCALEDIR}/locale/no/LC_MESSAGES/gnome-utils.mo
+${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/gnome-utils.mo
+${PKGLOCALEDIR}/locale/pt/LC_MESSAGES/gnome-utils.mo
+${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/gnome-utils.mo
+${PKGLOCALEDIR}/locale/ro/LC_MESSAGES/gnome-utils.mo
+${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/gnome-utils.mo
+${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/gnome-utils.mo
+${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/gnome-utils.mo
+${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/gnome-utils.mo
+${PKGLOCALEDIR}/locale/wa/LC_MESSAGES/gnome-utils.mo
+${PKGLOCALEDIR}/locale/zh_TW.Big5/LC_MESSAGES/gnome-utils.mo
+${PKGLOCALEDIR}/locale/zh_CN.GB2312/LC_MESSAGES/gnome-utils.mo
 share/pixmaps/logview/logview.xpm
 share/pixmaps/gdict.png
 share/pixmaps/gnome-fontsel.png