Author: cjcollier
Date: 2005-11-27 19:45:25 -0500 (Sun, 27 Nov 2005)
New Revision: 53532
Modified:
trunk/mono-tools/ChangeLog
trunk/mono-tools/configure.in
trunk/mono-tools/docbrowser/Makefile.am
Log:
- generating monodoc.desktop via automake rather than autoconf in
order to avoid substitution issues. credit to [EMAIL PROTECTED]
Modified: trunk/mono-tools/ChangeLog
===================================================================
--- trunk/mono-tools/ChangeLog 2005-11-27 21:59:45 UTC (rev 53531)
+++ trunk/mono-tools/ChangeLog 2005-11-28 00:45:25 UTC (rev 53532)
@@ -1,3 +1,15 @@
+2005-11-27 C.J. Collier <[EMAIL PROTECTED]>
+ * docbrowser/monodoc.desktop.in: Added patch from [EMAIL PROTECTED]
+
+ The desktop entry for the monodoc browser is not created properly
+ with the build system. The desktop entry's Exec line contains
+ ${exec_prefix} which is not resolved from the @bindir@ entry.
+
+ This issue would be masked when the exec-prefix is explicitly
+ passed to the configure script. Otherwise, the configure script
+ internally sets $exec_prefix to $prefix. But this is not
+ evaluated when substituting.
+
2005-10-27 Ben Maurer <[EMAIL PROTECTED]>
* configure.in (GTK_SHARP): simplify this check, since we are not
Modified: trunk/mono-tools/configure.in
===================================================================
--- trunk/mono-tools/configure.in 2005-11-27 21:59:45 UTC (rev 53531)
+++ trunk/mono-tools/configure.in 2005-11-28 00:45:25 UTC (rev 53532)
@@ -81,7 +81,6 @@
gnunit/src/AssemblyInfo.cs
gnunit/src/catalog.cs
docbrowser/Makefile
-docbrowser/monodoc.desktop
docbrowser/monodoc
docbrowser/AssemblyInfo.cs
po/Makefile.in
Modified: trunk/mono-tools/docbrowser/Makefile.am
===================================================================
--- trunk/mono-tools/docbrowser/Makefile.am 2005-11-27 21:59:45 UTC (rev
53531)
+++ trunk/mono-tools/docbrowser/Makefile.am 2005-11-28 00:45:25 UTC (rev
53532)
@@ -11,7 +11,7 @@
GTKHTML_TARGET=GtkHtmlHtmlRender.dll
endif
-CLEANFILES = browser.exe browser.exe.mdb admin.exe admin.exe.mdb
$(GECKO_TARGET) $(GECKO_TARGET).mdb $(GTKHTML_TARGET) $(GTKHTML_TARGET).mdb
+CLEANFILES = browser.exe browser.exe.mdb admin.exe admin.exe.mdb
$(GECKO_TARGET) $(GECKO_TARGET).mdb $(GTKHTML_TARGET) $(GTKHTML_TARGET).mdb
monodoc.desktop
monodoc_DATA = browser.exe $(GECKO_TARGET) $(GTKHTML_TARGET)
DISTCLEANFILES = AssemblyInfo.cs monodoc.desktop monodoc.in
@@ -80,5 +80,8 @@
desktopdir = $(datadir)/applications
desktop_DATA = monodoc.desktop
+monodoc.desktop: monodoc.desktop.in
+ sed -e "s|[EMAIL PROTECTED]@|$(bindir)|" $< > $@
+
pixmapdir = $(datadir)/pixmaps
pixmap_DATA = monodoc.png
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
