[packages/gnome-applets.git] / gnome-applets-am.patch

diff -Nur gnome-applets-1.100.0/battstat/Makefile.am gnome-applets-1.100.0.new/battstat/Makefile.am
--- gnome-applets-1.100.0/battstat/Makefile.am	Sun Apr 28 19:25:58 2002
+++ gnome-applets-1.100.0.new/battstat/Makefile.am	Sun Apr 28 23:04:24 2002
@@ -49,8 +49,6 @@
 schemadir   = @GCONF_SCHEMA_FILE_DIR@
 schema_DATA = battstat.schemas
 
-install-data-local:
-	GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(srcdir)/$(schema_DATA) ;
 
 serverdir       = $(libdir)/bonobo/servers
 server_in_files = GNOME_BattstatApplet.server.in
diff -Nur gnome-applets-1.100.0/cdplayer/Makefile.am gnome-applets-1.100.0.new/cdplayer/Makefile.am
--- gnome-applets-1.100.0/cdplayer/Makefile.am	Sun Apr 28 19:26:00 2002
+++ gnome-applets-1.100.0.new/cdplayer/Makefile.am	Sun Apr 28 23:04:14 2002
@@ -54,6 +54,4 @@
 $(schema_DATA)	\
 $(ui_DATA)
 
-install-data-local:
-	GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(srcdir)/$(schema_DATA) ;
 
diff -Nur gnome-applets-1.100.0/charpick/Makefile.am gnome-applets-1.100.0.new/charpick/Makefile.am
--- gnome-applets-1.100.0/charpick/Makefile.am	Sun Apr 28 19:26:03 2002
+++ gnome-applets-1.100.0.new/charpick/Makefile.am	Sun Apr 28 23:04:06 2002
@@ -34,6 +34,4 @@
 	$(ui_DATA)	\
 	$(schema_DATA)
 
-install-data-local:
-	GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(srcdir)/$(schema_DATA) ;
 
diff -Nur gnome-applets-1.100.0/drivemount/Makefile.am gnome-applets-1.100.0.new/drivemount/Makefile.am
--- gnome-applets-1.100.0/drivemount/Makefile.am	Sun Apr 28 19:26:05 2002
+++ gnome-applets-1.100.0.new/drivemount/Makefile.am	Sun Apr 28 23:03:56 2002
@@ -59,6 +59,4 @@
 $(ui_DATA)	\
 drivemount-applet.png
 
-install-data-local:
-	GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(srcdir)/$(schema_DATA) ;
 
diff -Nur gnome-applets-1.100.0/geyes/Makefile.am gnome-applets-1.100.0.new/geyes/Makefile.am
--- gnome-applets-1.100.0/geyes/Makefile.am	Sun Apr 28 19:26:07 2002
+++ gnome-applets-1.100.0.new/geyes/Makefile.am	Sun Apr 28 23:03:43 2002
@@ -44,7 +44,5 @@
 	     $(schema_DATA) \
 	     $(ui_DATA)
 
-install-data-local:
-	GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(srcdir)/$(schema_DATA) ;
 
 
diff -Nur gnome-applets-1.100.0/gkb-new/Makefile.am gnome-applets-1.100.0.new/gkb-new/Makefile.am
--- gnome-applets-1.100.0/gkb-new/Makefile.am	Sun Apr 28 19:26:09 2002
+++ gnome-applets-1.100.0.new/gkb-new/Makefile.am	Sun Apr 28 23:03:33 2002
@@ -59,6 +59,4 @@
 	< gkb_xmmap.in >gkb_xmmap.tmp \
 	&& mv gkb_xmmap.tmp gkb_xmmap
 
-install-data-local:
-	GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(srcdir)/$(schema_DATA) ;
 
diff -Nur gnome-applets-1.100.0/gtik/Makefile.am gnome-applets-1.100.0.new/gtik/Makefile.am
--- gnome-applets-1.100.0/gtik/Makefile.am	Sun Apr 28 19:26:17 2002
+++ gnome-applets-1.100.0.new/gtik/Makefile.am	Sun Apr 28 23:03:19 2002
@@ -34,6 +34,4 @@
 	$(ui_DATA)		\
 	$(schema_DATA)
 	
-install-data-local:
-		GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(srcdir)/$(schema_DATA) ;
 
diff -Nur gnome-applets-1.100.0/gweather/Makefile.am gnome-applets-1.100.0.new/gweather/Makefile.am
--- gnome-applets-1.100.0/gweather/Makefile.am	Sun Apr 28 19:26:20 2002
+++ gnome-applets-1.100.0.new/gweather/Makefile.am	Sun Apr 28 23:03:10 2002
@@ -31,9 +31,6 @@
 uidir = $(datadir)/gnome-2.0/ui
 ui_DATA = GNOME_GWeatherApplet.xml
 
-install-data-local:
-	GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(srcdir)/$(schema_DATA) ;
-	
 serverdir       = $(libdir)/bonobo/servers
 server_in_files = GNOME_GWeatherApplet_Factory.server.in
 server_DATA     = $(server_in_files:.server.in=.server)
diff -Nur gnome-applets-1.100.0/mini-commander/src/Makefile.am gnome-applets-1.100.0.new/mini-commander/src/Makefile.am
--- gnome-applets-1.100.0/mini-commander/src/Makefile.am	Sun Apr 28 19:26:26 2002
+++ gnome-applets-1.100.0.new/mini-commander/src/Makefile.am	Sun Apr 28 23:02:49 2002
@@ -51,8 +51,6 @@
 uidir = $(datadir)/gnome-2.0/ui
 ui_DATA = GNOME_MiniCommanderApplet.xml
 
-install-data-local:
-	GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(srcdir)/$(schema_DATA) ;
 
 @INTLTOOL_SERVER_RULE@
 
diff -Nur gnome-applets-1.100.0/modemlights/Makefile.am gnome-applets-1.100.0.new/modemlights/Makefile.am
--- gnome-applets-1.100.0/modemlights/Makefile.am	Sun Apr 28 19:26:31 2002
+++ gnome-applets-1.100.0.new/modemlights/Makefile.am	Sun Apr 28 23:01:39 2002
@@ -31,8 +31,3 @@
 	digits.xpm $(server_in_files)	\
 	$(schema_DATA) $(ui_DATA)
 
-install-data-local:
-	for p in $(schema_DATA); do \
-		GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(srcdir)/$$p ; \
-	done
-
diff -Nur gnome-applets-1.100.0/multiload/Makefile.am gnome-applets-1.100.0.new/multiload/Makefile.am
--- gnome-applets-1.100.0/multiload/Makefile.am	Sun Apr 28 19:26:35 2002
+++ gnome-applets-1.100.0.new/multiload/Makefile.am	Sun Apr 28 23:02:07 2002
@@ -35,9 +35,6 @@
 schemadir 	= @GCONF_SCHEMA_FILE_DIR@
 schema_DATA	= multiload.schemas
 
-install-data-local:
-	GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(srcdir)/$(schema_DATA) ;
-		
 EXTRA_DIST =	\
 		GNOME_MultiLoadApplet_Factory.server.in \
 		multiload.schemas \
diff -Nur gnome-applets-1.100.0/panel-menu/Makefile.am gnome-applets-1.100.0.new/panel-menu/Makefile.am
--- gnome-applets-1.100.0/panel-menu/Makefile.am	Sun Apr 28 19:26:39 2002
+++ gnome-applets-1.100.0.new/panel-menu/Makefile.am	Sun Apr 28 23:02:22 2002
@@ -63,5 +63,3 @@
 
 @INTLTOOL_SERVER_RULE@
 
-install-data-local:
-	GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(srcdir)/$(schema_DATA) ;
diff -Nur gnome-applets-1.100.0/xmldocs.make gnome-applets-1.100.0.new/xmldocs.make
--- gnome-applets-1.100.0/xmldocs.make	Sun Apr 28 19:25:58 2002
+++ gnome-applets-1.100.0.new/xmldocs.make	Sun Apr 28 23:01:01 2002
@@ -52,10 +52,10 @@
 	done
 	touch omf_timestamp
 
-$(docname).xml: $(entities)
-        -ourdir=`pwd`;  \
-        cd $(srcdir);   \
-        cp $(entities) $$ourdir
+#$(docname).xml: $(entities)
+#        -ourdir=`pwd`;  \
+#        cd $(srcdir);   \
+#        cp $(entities) $$ourdir
 
 app-dist-hook: 
 	-$(mkinstalldirs) $(distdir)/figures
Commit	Line	Data
186a116f	1	diff -Nur gnome-applets-1.100.0/battstat/Makefile.am gnome-applets-1.100.0.new/battstat/Makefile.am
	2	--- gnome-applets-1.100.0/battstat/Makefile.am Sun Apr 28 19:25:58 2002
	3	+++ gnome-applets-1.100.0.new/battstat/Makefile.am Sun Apr 28 23:04:24 2002
	4	@@ -49,8 +49,6 @@
	5	schemadir = @GCONF_SCHEMA_FILE_DIR@
	6	schema_DATA = battstat.schemas
	7
	8	-install-data-local:
	9	- GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(srcdir)/$(schema_DATA) ;
	10
	11	serverdir = $(libdir)/bonobo/servers
	12	server_in_files = GNOME_BattstatApplet.server.in
	13	diff -Nur gnome-applets-1.100.0/cdplayer/Makefile.am gnome-applets-1.100.0.new/cdplayer/Makefile.am
	14	--- gnome-applets-1.100.0/cdplayer/Makefile.am Sun Apr 28 19:26:00 2002
	15	+++ gnome-applets-1.100.0.new/cdplayer/Makefile.am Sun Apr 28 23:04:14 2002
	16	@@ -54,6 +54,4 @@
	17	$(schema_DATA) \
	18	$(ui_DATA)
	19
	20	-install-data-local:
	21	- GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(srcdir)/$(schema_DATA) ;
	22
	23	diff -Nur gnome-applets-1.100.0/charpick/Makefile.am gnome-applets-1.100.0.new/charpick/Makefile.am
	24	--- gnome-applets-1.100.0/charpick/Makefile.am Sun Apr 28 19:26:03 2002
	25	+++ gnome-applets-1.100.0.new/charpick/Makefile.am Sun Apr 28 23:04:06 2002
	26	@@ -34,6 +34,4 @@
	27	$(ui_DATA) \
	28	$(schema_DATA)
	29
	30	-install-data-local:
	31	- GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(srcdir)/$(schema_DATA) ;
	32
	33	diff -Nur gnome-applets-1.100.0/drivemount/Makefile.am gnome-applets-1.100.0.new/drivemount/Makefile.am
	34	--- gnome-applets-1.100.0/drivemount/Makefile.am Sun Apr 28 19:26:05 2002
	35	+++ gnome-applets-1.100.0.new/drivemount/Makefile.am Sun Apr 28 23:03:56 2002
	36	@@ -59,6 +59,4 @@
	37	$(ui_DATA) \
	38	drivemount-applet.png
	39
	40	-install-data-local:
	41	- GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(srcdir)/$(schema_DATA) ;
	42
	43	diff -Nur gnome-applets-1.100.0/geyes/Makefile.am gnome-applets-1.100.0.new/geyes/Makefile.am
	44	--- gnome-applets-1.100.0/geyes/Makefile.am Sun Apr 28 19:26:07 2002
	45	+++ gnome-applets-1.100.0.new/geyes/Makefile.am Sun Apr 28 23:03:43 2002
	46	@@ -44,7 +44,5 @@
	47	$(schema_DATA) \
	48	$(ui_DATA)
	49
	50	-install-data-local:
	51	- GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(srcdir)/$(schema_DATA) ;
	52
	53
	54	diff -Nur gnome-applets-1.100.0/gkb-new/Makefile.am gnome-applets-1.100.0.new/gkb-new/Makefile.am
	55	--- gnome-applets-1.100.0/gkb-new/Makefile.am Sun Apr 28 19:26:09 2002
	56	+++ gnome-applets-1.100.0.new/gkb-new/Makefile.am Sun Apr 28 23:03:33 2002
	57	@@ -59,6 +59,4 @@
	58	< gkb_xmmap.in >gkb_xmmap.tmp \
	59	&& mv gkb_xmmap.tmp gkb_xmmap
	60
	61	-install-data-local:
	62	- GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(srcdir)/$(schema_DATA) ;
	63
	64	diff -Nur gnome-applets-1.100.0/gtik/Makefile.am gnome-applets-1.100.0.new/gtik/Makefile.am
65	--- gnome-applets-1.100.0/gtik/Makefile.am Sun Apr 28 19:26:17 2002
66	+++ gnome-applets-1.100.0.new/gtik/Makefile.am Sun Apr 28 23:03:19 2002
67	@@ -34,6 +34,4 @@
68	$(ui_DATA) \
69	$(schema_DATA)
70
71	-install-data-local:
72	- GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(srcdir)/$(schema_DATA) ;
73
74	diff -Nur gnome-applets-1.100.0/gweather/Makefile.am gnome-applets-1.100.0.new/gweather/Makefile.am
75	--- gnome-applets-1.100.0/gweather/Makefile.am Sun Apr 28 19:26:20 2002
76	+++ gnome-applets-1.100.0.new/gweather/Makefile.am Sun Apr 28 23:03:10 2002
77	@@ -31,9 +31,6 @@
78	uidir = $(datadir)/gnome-2.0/ui
79	ui_DATA = GNOME_GWeatherApplet.xml
80
81	-install-data-local:
82	- GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(srcdir)/$(schema_DATA) ;
83	-
84	serverdir = $(libdir)/bonobo/servers
85	server_in_files = GNOME_GWeatherApplet_Factory.server.in
86	server_DATA = $(server_in_files:.server.in=.server)
87	diff -Nur gnome-applets-1.100.0/mini-commander/src/Makefile.am gnome-applets-1.100.0.new/mini-commander/src/Makefile.am
88	--- gnome-applets-1.100.0/mini-commander/src/Makefile.am Sun Apr 28 19:26:26 2002
89	+++ gnome-applets-1.100.0.new/mini-commander/src/Makefile.am Sun Apr 28 23:02:49 2002
90	@@ -51,8 +51,6 @@
91	uidir = $(datadir)/gnome-2.0/ui
92	ui_DATA = GNOME_MiniCommanderApplet.xml
93
94	-install-data-local:
95	- GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(srcdir)/$(schema_DATA) ;
96
97	@INTLTOOL_SERVER_RULE@
98
99	diff -Nur gnome-applets-1.100.0/modemlights/Makefile.am gnome-applets-1.100.0.new/modemlights/Makefile.am
100	--- gnome-applets-1.100.0/modemlights/Makefile.am Sun Apr 28 19:26:31 2002
101	+++ gnome-applets-1.100.0.new/modemlights/Makefile.am Sun Apr 28 23:01:39 2002
102	@@ -31,8 +31,3 @@
103	digits.xpm $(server_in_files) \
104	$(schema_DATA) $(ui_DATA)
105
106	-install-data-local:
107	- for p in $(schema_DATA); do \
108	- GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(srcdir)/$$p ; \
109	- done
110	-
111	diff -Nur gnome-applets-1.100.0/multiload/Makefile.am gnome-applets-1.100.0.new/multiload/Makefile.am
112	--- gnome-applets-1.100.0/multiload/Makefile.am Sun Apr 28 19:26:35 2002
113	+++ gnome-applets-1.100.0.new/multiload/Makefile.am Sun Apr 28 23:02:07 2002
114	@@ -35,9 +35,6 @@
115	schemadir = @GCONF_SCHEMA_FILE_DIR@
116	schema_DATA = multiload.schemas
117
118	-install-data-local:
119	- GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(srcdir)/$(schema_DATA) ;
120	-
121	EXTRA_DIST = \
122	GNOME_MultiLoadApplet_Factory.server.in \
123	multiload.schemas \
124	diff -Nur gnome-applets-1.100.0/panel-menu/Makefile.am gnome-applets-1.100.0.new/panel-menu/Makefile.am
125	--- gnome-applets-1.100.0/panel-menu/Makefile.am Sun Apr 28 19:26:39 2002
126	+++ gnome-applets-1.100.0.new/panel-menu/Makefile.am Sun Apr 28 23:02:22 2002
127	@@ -63,5 +63,3 @@
128
129	@INTLTOOL_SERVER_RULE@
130
131	-install-data-local:
132	- GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(srcdir)/$(schema_DATA) ;
133	diff -Nur gnome-applets-1.100.0/xmldocs.make gnome-applets-1.100.0.new/xmldocs.make
134	--- gnome-applets-1.100.0/xmldocs.make Sun Apr 28 19:25:58 2002
135	+++ gnome-applets-1.100.0.new/xmldocs.make Sun Apr 28 23:01:01 2002
0351e7ed	136	@@ -52,10 +52,10 @@
	137	done
	138	touch omf_timestamp
	139
	140	-$(docname).xml: $(entities)
	141	- -ourdir=`pwd`; \
	142	- cd $(srcdir); \
	143	- cp $(entities) $$ourdir
	144	+#$(docname).xml: $(entities)
	145	+# -ourdir=`pwd`; \
	146	+# cd $(srcdir); \
	147	+# cp $(entities) $$ourdir
	148
	149	app-dist-hook:
	150	-$(mkinstalldirs) $(distdir)/figures