Re: Problems with xml-i18n-prepare and .directory files

[Kjartan Maraas <kmaraas online no>]

Den tor, 2001-09-06 kl. 10:53 skrev Kjartan Maraas:
> After running xml-i18n-prepare in gnome-core I noticed that it didn't
> make the neccesary changes to Makefile.am in the directories containing
> .directory files. Somehow the script gets confused in there.
> 
[SNIP]

> 
> What next? Can someone explain how to change Makefile.am by hand to make
> it work? Do we need to fix the script?
> 

The attached diff fixed it for me, but I feel dirty after doing it.
Please tell me how to improve it :)

Cheers
Kjartan

Index: configure.in
===================================================================
RCS file: /cvs/gnome/gnome-core/configure.in,v
retrieving revision 1.305.2.4
diff -u -r1.305.2.4 configure.in
--- configure.in	2001/08/31 11:56:48	1.305.2.4
+++ configure.in	2001/09/06 12:47:34
@@ -17,7 +17,7 @@
 GNOME_PRINT_OPTIONAL=0.25
 
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(gnome-core, 1.4.0.4)
+AM_INIT_AUTOMAKE(gnome-core, 1.4.0.5pre)
 
 AM_MAINTAINER_MODE
 
Index: applets/applet-dirs/Makefile.am
===================================================================
RCS file: /cvs/gnome/gnome-core/applets/applet-dirs/Makefile.am,v
retrieving revision 1.5
diff -u -r1.5 Makefile.am
--- applets/applet-dirs/Makefile.am	1999/05/26 02:18:27	1.5
+++ applets/applet-dirs/Makefile.am	2001/09/06 12:47:34
@@ -7,6 +7,17 @@
 Amusementsdir    = $(appletdir)/Amusements
 Clocksdir	 = $(appletdir)/Clocks
 
+directory_in_files = \
+	Utility.directory.in	\
+	Monitors.directory.in	\
+	Multimedia.directory.in	\
+	Amusements.directory.in	\
+	Network.directory.in	\
+	Clocks.directory.in
+
+noinst_DATA = $(directory_in_files:.directory.in=.directory)
+@XML_I18N_MERGE_DIRECTORY_RULE@
+
 Directory_files = \
 	Utility.directory \
 	Monitors.directory \
@@ -24,13 +35,15 @@
 Amusements_DATA =
 Clocks_DATA =
 
-EXTRA_DIST = $(Utility_DATA) \
-	     $(Monitors_DATA) \
-	     $(Multimedia_DATA) \
-	     $(Network_DATA) \
-	     $(Amusements_DATA) \
-	     $(Clocks_DATA) \
-	     $(Directory_files)
+EXTRA_DIST = $(Utility_DATA)		\
+	     $(Monitors_DATA)		\
+	     $(Multimedia_DATA)		\
+	     $(Network_DATA)		\
+	     $(Amusements_DATA)		\
+	     $(Clocks_DATA)		\
+	     $(Directory_files)		\
+	     $(directory_in_files) 	\
+	     $(noinst_DATA)
 
 install-data-local:
 	$(mkinstalldirs) $(DESTDIR)$(Utilitydir)
Index: desktop-links/Makefile.am
===================================================================
RCS file: /cvs/gnome/gnome-core/desktop-links/Makefile.am,v
retrieving revision 1.28.8.2
diff -u -r1.28.8.2 Makefile.am
--- desktop-links/Makefile.am	2001/09/05 22:58:52	1.28.8.2
+++ desktop-links/Makefile.am	2001/09/06 12:47:34
@@ -13,10 +13,52 @@
 
 gnewdir           = $(datadir)/mc/templates
 
-gnew_in_files = GIMP.desktop.in 
-gnew_DATA = $(gnew_in_files:.desktop.in=.desktop)
+desktop_in_files = \
+	Emacs.desktop.in	\
+	Eterm.desktop.in	\
+	FileRunner.desktop.in	\
+	gaspell.desktop.in	\
+	GIMP.desktop.in		\
+	Gmc.desktop.in		\
+	GXanim.desktop.in	\
+	Imlib_config.desktop.in	\
+	Kterm.desktop.in	\
+	lynx.desktop.in		\
+	Netscape.desktop.in	\
+	realplayer.desktop.in	\
+	rxvt.desktop.in		\
+	Tkrat.desktop.in	\
+	TkSETI.desktop.in	\
+	UNIX.desktop.in		\
+	UNIX-regular.desktop.in	\
+	Vim.desktop.in		\
+	Vnterm.desktop.in	\
+	WordPerfect.desktop.in	\
+	xcolsel.desktop.in	\
+	Xemacs.desktop.in	\
+	XEphem.desktop.in	\
+	XMcd.desktop.in		\
+	xmix.desktop.in		\
+	xv.desktop.in		\
+	GIMP.desktop.in		\
+	Gmc.desktop.in
+gnew_DATA = $(desktop_in_files:.desktop.in=.desktop)
 @XML_I18N_MERGE_DESKTOP_RULE@
 
+
+directory_in_files = \
+	Applications.directory.in	\
+	Development.directory.in	\
+	Games.directory.in		\
+	Graphics.directory.in		\
+	Internet.directory.in		\
+	Multimedia.directory.in		\
+	Root.directory.in		\
+	Settings.directory.in		\
+	System.directory.in		\
+	Utilities.directory.in
+
+noinst_DATA = $(directory_in_files:.directory.in=.directory)
 @XML_I18N_MERGE_DIRECTORY_RULE@
 
 Order_files = \
@@ -54,7 +96,6 @@
 	FileRunner.desktop	\
 	TkSETI.desktop		\
 	rxvt.desktop		\
-	lynx.desktop		\
 	xbmbrowser.desktop	\
 	Vim.desktop		\
 	xcolsel.desktop		\
@@ -101,9 +142,10 @@
 
 EXTRA_DIST = $(Applications_DATA) $(Graphics_DATA) $(Utilities_DATA) \
 	$(System_DATA) $(Multimedia_DATA) $(Internet_DATA) $(Games_DATA) \
-	$(Settings_DATA) \
-	$(Directory_files) $(Order_files) $(Root_DATA) $(Settings_Order_files)
-
+	$(Settings_DATA) $(noinst_DATA) $(directory_in_files) \
+	$(Directory_files) $(Order_files) $(Root_DATA) $(Settings_Order_files) \
+	$(desktop_in_files) $(gnew_DATA)
+	
 install-data-local: $(Directory_files)
 	$(mkinstalldirs) $(DESTDIR)$(Applicationsdir)
 	$(mkinstalldirs) $(DESTDIR)$(Graphicsdir)
Index: gnome-hint/Makefile.am
===================================================================
RCS file: /cvs/gnome/gnome-core/gnome-hint/Makefile.am,v
retrieving revision 1.8.8.1
diff -u -r1.8.8.1 Makefile.am
--- gnome-hint/Makefile.am	2001/09/03 19:18:28	1.8.8.1
+++ gnome-hint/Makefile.am	2001/09/06 12:47:34
@@ -27,11 +27,6 @@
 util_in_files = gnome-hint.desktop.in
 util_DATA = $(util_in_files:.desktop.in=.desktop)
 
-EXTRA_DIST = \
-	gnome-hint-properties.desktop.in \
-	gnome-hint.png \
-	gnome-hint.desktop.in
-
 sysdir = $(datadir)/control-center/Session/
 sys_in_files = gnome-hint-properties.desktop.in
 sys_DATA = $(sys_in_files:.desktop.in=.desktop)
@@ -39,6 +34,13 @@
 
 pixmapsdir = $(datadir)/pixmaps
 pixmaps_DATA = gnome-hint.png
+
+EXTRA_DIST = \
+	$(util_in_files)	\
+	$(util_DATA)		\
+	$(sys_in_files)		\
+	$(sys_DATA)		\
+	gnome-hint.png
 
 install-data-local:
 	$(mkinstalldirs) $(DESTDIR)$(datadir)/gnome/apps/Settings/Session/
Index: panel/config/Makefile.am
===================================================================
RCS file: /cvs/gnome/gnome-core/panel/config/Makefile.am,v
retrieving revision 1.1
diff -u -r1.1 Makefile.am
--- panel/config/Makefile.am	2001/05/30 02:06:36	1.1
+++ panel/config/Makefile.am	2001/09/06 12:47:34
@@ -1,5 +1,3 @@
-SUBDIRS =
-
 EXTRA_DIST = \
 	panel.global		\
 	panel.config		\
@@ -9,8 +7,8 @@
 Config_directory = $(sysconfdir)/gnome/panel-config/panel.d/default
 
 install-data-local:
-	$(mkinstalldirs) $(Global_directory)
-	$(mkinstalldirs) $(Config_directory)
-	$(INSTALL_DATA) $(srcdir)/panel.global $(Global_directory)/panel
-	$(INSTALL_DATA) $(srcdir)/panel.config $(Config_directory)/panel
-	$(INSTALL_DATA) $(srcdir)/Applet_Config $(Config_directory)
+	$(mkinstalldirs) $(DESTDIR)$(Global_directory)
+	$(mkinstalldirs) $(DESTDIR)$(Config_directory)
+	$(INSTALL_DATA) $(srcdir)/panel.global $(DESTDIR)$(Global_directory)/panel
+	$(INSTALL_DATA) $(srcdir)/panel.config $(DESTDIR)$(Config_directory)/panel
+	$(INSTALL_DATA) $(srcdir)/Applet_Config $(DESTDIR)$(Config_directory)